t7060: actually test "git diff-index --cached -M"

matthieuprat · gitster · commit b894d3e7881c · 2015-09-02T12:23:30.000-07:00
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 &lt;matthieuprat@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
 '
 

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ test_expect_success 'git diff-index --cached -M shows 2 added + 1 unmerged' '`
`103`	`103`	`A THREE`
`104`	`104`	`A TWO`
`105`	`105`	`EOF`
`106`		`- git diff-index --cached --name-status HEAD >actual &&`
	`106`	`+ git diff-index --cached -M --name-status HEAD >actual &&`
`107`	`107`	`test_cmp expected actual`
`108`	`108`	`'`
`109`	`109`