summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Prat <matthieuprat@gmail.com>2015-09-02 14:12:55 -0400
committerJunio C Hamano <gitster@pobox.com>2015-09-02 12:23:30 -0700
commitb894d3e7881cf48770a25fb16a90310afa30834f (patch)
tree768153d448df860aba5cdcfff606e5e2236b7a53
parentd7c9bf22351e39756f93f09b4251a6b5861d9cc0 (diff)
downloadgit-mp/t7060-diff-index-test.tar.gz
t7060: actually test "git diff-index --cached -M"mp/t7060-diff-index-test
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>
-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 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
'