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). Give the command the option it deserves and the test a raison d'être. Signed-off-by: Matthieu Prat <matthieuprat@xxxxxxxxx> --- 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 741ec08..32d8176 100755 --- a/t/t7060-wtstatus.sh +++ b/t/t7060-wtstatus.sh @@ -106,7 +106,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 ' -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html