diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-07-11 15:38:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-11 15:38:48 -0700 |
| commit | a2d1f00bdd79e3059e6a819c0f65e8071e39dac8 (patch) | |
| tree | 0f075cd0f4f191f185f1216aec7c937deb44b86e /combine-diff.c | |
| parent | 30cc8d0f147546d4dd77bf497f4dec51e7265bd8 (diff) | |
| parent | cfb19ae05f4565bc9d0a0cb3a23a3d2ab9fb8fab (diff) | |
| download | git-a2d1f00bdd79e3059e6a819c0f65e8071e39dac8.tar.gz | |
Merge branch 'rs/combine-diff-with-incompatible-options'
Certain diff options are currently ignored when combined-diff is
shown; mark them as incompatible with the feature.
* rs/combine-diff-with-incompatible-options:
combine-diff: abort if --output is given
combine-diff: abort if --ignore-matching-lines is given
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/combine-diff.c b/combine-diff.c index b724f02123..b0ece95480 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -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 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 */ if (!num_parent) return; |