undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/combine-diff-with-incompatible-options' into maint

Browse Source 
Certain diff options are currently ignored when combined-diff is
shown; mark them as incompatible with the feature.
source: <220524.86v8tuvfl1.gmgdl@evledraar.gmail.com>

* rs/combine-diff-with-incompatible-options:
  combine-diff: abort if --output is given
  combine-diff: abort if --ignore-matching-lines is given
This commit is contained in:
Junio C Hamano 2022-07-27 13:00:32 -07:00
commit 2c915bb11e
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
combine-diff.c
View File

@ -1498,6 +1498,13 @@ void diff_tree_combined(const struct object_id *oid,
int i, num_paths, needsep, show_log_first, num_parent = parents->nr; int i, num_paths, needsep, show_log_first, num_parent = parents->nr;
int need_generic_pathscan; int need_generic_pathscan;
if (opt->ignore_regex_nr)
die("combined diff and '%s' cannot be used together",
"--ignore-matching-lines");
if (opt->close_file)
die("combined diff and '%s' cannot be used together",
"--output");
/* nothing to do, if no parents */ /* nothing to do, if no parents */
if (!num_parent) if (!num_parent)
return; return;