Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2021-02-05 17:46:11 +0300
committerJunio C Hamano <gitster@pobox.com>2021-02-07 08:14:31 +0300
commitf1ce6c191e9d15ce78041d8b6496c246b10d9b2d (patch)
treebd2e245ebc24622e25b7b1f0c1fbe821719ab4dc /range-diff.h
parent5189bb87249434fba3a82f17b2bc6c93025ba88d (diff)
range-diff: combine all options in a single data structure
This will make it easier to implement the `--left-only` and `--right-only` options. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'range-diff.h')
-rw-r--r--range-diff.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/range-diff.h b/range-diff.h
index 583ced2e8e..0bae6b0cb1 100644
--- a/range-diff.h
+++ b/range-diff.h
@@ -6,14 +6,18 @@
#define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60
+struct range_diff_options {
+ int creation_factor;
+ unsigned dual_color:1;
+ const struct diff_options *diffopt; /* may be NULL */
+ const struct strvec *other_arg; /* may be NULL */
+};
+
/*
- * Compare series of commits in RANGE1 and RANGE2, and emit to the
- * standard output. NULL can be passed to DIFFOPT to use the built-in
- * default.
+ * Compare series of commits in `range1` and `range2`, and emit to the
+ * standard output.
*/
int show_range_diff(const char *range1, const char *range2,
- int creation_factor, int dual_color,
- const struct diff_options *diffopt,
- const struct strvec *other_arg);
+ struct range_diff_options *opts);
#endif