mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/range-diff-one-side-only'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2021-02-17 17:21:41 -08:00
parent 77348b0e6e 1e79f97326
commit dadc91ff0c
7 changed files with 120 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
range-diff.h
View File

@ -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