From b894d3e7881cf48770a25fb16a90310afa30834f Mon Sep 17 00:00:00 2001 From: Matthieu Prat Date: Wed, 2 Sep 2015 14:12:55 -0400 Subject: [PATCH] t7060: actually test "git diff-index --cached -M" A test was designed for "git diff-index --cached -M" but the command is run without the "-M" option (which makes the test essentially identical to its preceding counterpart). Signed-off-by: Matthieu Prat Signed-off-by: Junio C Hamano --- t/t7060-wtstatus.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index a5b7a568bc..a886a4436f 100755 --- a/t/t7060-wtstatus.sh +++ b/t/t7060-wtstatus.sh @@ -103,7 +103,7 @@ test_expect_success 'git diff-index --cached -M shows 2 added + 1 unmerged' ' A THREE A TWO EOF - git diff-index --cached --name-status HEAD >actual && + git diff-index --cached -M --name-status HEAD >actual && test_cmp expected actual '