From: Matthieu Prat <matthieuprat@gmail.com>
Date: Wed, 2 Sep 2015 18:12:55 +0000 (-0400)
Subject: t7060: actually test "git diff-index --cached -M"
X-Git-Tag: v2.6.0-rc2~3^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b894d3e7881cf48770a25fb16a90310afa30834f;p=git

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 <matthieuprat@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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
 '