diff-merges: fix -m to properly override -c/--cc
Logically, -m, -c, --cc specify 3 different formats for representing merge commits, yet -m doesn't in fact override -c or --cc, that makes no sense. Fix -m to properly override -c/--cc, and change the tests accordingly. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
Dec 21, 2020 at 18:19 UTC
6fc944d8956bf75bf2e52a871c02b71b4f9dfcba
2 files changed
+3
-2
diff-merges.c
+1
@@ -33,6 +33,7 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
33
const char *arg = argv[0];
34
35
if (!strcmp(arg, "-m")) {
36
+ suppress(revs);
37
/*
38
* To "diff-index", "-m" means "match missing", and to the "log"
39
* family of commands, it means "show full diff for merges". Set
t/t4013-diff-various.sh
+2
-2
@@ -329,8 +329,8 @@ log --first-parent --diff-merges=off -p master
329
log -p --first-parent master
330
log -m -p --first-parent master
331
log -m -p master
332
-:failure log --cc -m -p master
333
-:failure log -c -m -p master
332
+log --cc -m -p master
333
+log -c -m -p master
334
log -SF master
335
log -S F master
336
log -SF -p master