t4013: add tests for -m failing to override -c/--cc
authorSergey Organov <redacted>
Mon, 21 Dec 2020 15:19:44 +0000 (18:19 +0300)
committerJunio C Hamano <redacted>
Mon, 21 Dec 2020 21:47:31 +0000 (13:47 -0800)
commitec315c66bb73e26542b7b3de8abaffa310c4380e
tree3045585222e75a1a5b65ef875fe23b581c88f6d3
parent14c14b44e47bc8c420e5161abc8fe283121f3e31
t4013: add tests for -m failing to 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.

Add 2 expected to fail tests that demonstrate the problem.

Signed-off-by: Sergey Organov <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t4013-diff-various.sh
t/t4013/diff.log_--cc_-m_-p_master [new file with mode: 0644]
t/t4013/diff.log_-c_-m_-p_master [new file with mode: 0644]
git clone https://git.99rst.org/PROJECT