aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-09-14 11:46:28 -0700
committerJunio C Hamano <gitster@pobox.com>2015-09-14 11:46:31 -0700
commit971f9ea54313d189e6a79395b5a6e335101bd85a (patch)
treea72e52a90f2dbceca13b69d9776f99012df8b06b
parente0eeba263c19f0cd2e5ca3cad305d61b2d837a63 (diff)
parentb894d3e7881cf48770a25fb16a90310afa30834f (diff)
downloadgit-971f9ea54313d189e6a79395b5a6e335101bd85a.tar.gz
git-971f9ea54313d189e6a79395b5a6e335101bd85a.tar.xz
Merge branch 'mp/t7060-diff-index-test'
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"
-rwxr-xr-xt/t7060-wtstatus.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index 741ec0857..32d81765c 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
'