diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 15:19:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 21:47:31 (GMT) |
| commit | 6fc944d8956bf75bf2e52a871c02b71b4f9dfcba (patch) | |
| tree | f14539c4165b7440c969453102f8f5c55e8be020 /diff-merges.c | |
| parent | ec315c66bb73e26542b7b3de8abaffa310c4380e (diff) | |
| download | git-6fc944d8956bf75bf2e52a871c02b71b4f9dfcba.zip git-6fc944d8956bf75bf2e52a871c02b71b4f9dfcba.tar.gz git-6fc944d8956bf75bf2e52a871c02b71b4f9dfcba.tar.bz2 | |
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>
Diffstat (limited to 'diff-merges.c')
| -rw-r--r-- | diff-merges.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/diff-merges.c b/diff-merges.c index 225edd2..047bf81 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -33,6 +33,7 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) const char *arg = argv[0]; if (!strcmp(arg, "-m")) { + suppress(revs); /* * To "diff-index", "-m" means "match missing", and to the "log" * family of commands, it means "show full diff for merges". Set |