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 /t/t4013-diff-various.sh | |
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 't/t4013-diff-various.sh')
-rwxr-xr-x | t/t4013-diff-various.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 64d9fce..8d8178a 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -329,8 +329,8 @@ log --first-parent --diff-merges=off -p master log -p --first-parent master log -m -p --first-parent master log -m -p master -:failure log --cc -m -p master -:failure log -c -m -p master +log --cc -m -p master +log -c -m -p master log -SF master log -S F master log -SF -p master |