kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

combine-diff: abort if --output is given 

The code for combined diffs currently only writes to stdout.  Abort and
report that fact instead of silently ignoring the --output option.  The
(empty) output file has already been created at that point, though.

Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
René Scharfe 2022-06-18 13:12:34 +02:00 committed by Junio C Hamano
parent e3d1be4237
commit cfb19ae05f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
combine-diff.c
View File

@ -1501,6 +1501,9 @@ void diff_tree_combined(const struct object_id *oid,
if (opt->ignore_regex_nr) if (opt->ignore_regex_nr)
die("combined diff and '%s' cannot be used together", die("combined diff and '%s' cannot be used together",
"--ignore-matching-lines"); "--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)