diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-02-18 04:21:41 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-02-18 04:21:41 +0300 |
commit | dadc91ff0c15b655070ad334a27a734e91635bd5 (patch) | |
tree | c53f828a0941fae682ee087bd21e935de607e2e5 /range-diff.h | |
parent | 77348b0e6e350ec81b3880f99c6077d165df2276 (diff) | |
parent | 1e79f973266cfe0e3bab0e26e869b682078e457d (diff) |
Merge branch 'js/range-diff-one-side-only'
The "git range-diff" command learned "--(left|right)-only" option
to show only one side of the compared range.
* js/range-diff-one-side-only:
range-diff: offer --left-only/--right-only options
range-diff: move the diffopt initialization down one layer
range-diff: combine all options in a single data structure
range-diff: simplify code spawning `git log`
range-diff: libify the read_patches() function again
range-diff: avoid leaking memory in two error code paths
Diffstat (limited to 'range-diff.h')
-rw-r--r-- | range-diff.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/range-diff.h b/range-diff.h index 4abd70c40f..04ffe217be 100644 --- a/range-diff.h +++ b/range-diff.h @@ -6,15 +6,20 @@ #define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60 +struct range_diff_options { + int creation_factor; + unsigned dual_color:1; + unsigned left_only:1, right_only: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); /* * Determine whether the given argument is usable as a range argument of `git |