Merge branch 'mp/t7060-diff-index-test'

gitster · gitster · commit 971f9ea54313 · 2015-09-14T11:46:31.000-07:00
Fix an old test that was doing the same thing as another one.

* mp/t7060-diff-index-test:
  t7060: actually test "git diff-index --cached -M"
diff --git 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
 '
 

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