t7060: actually test "git diff-index --cached -M"
authorMatthieu Prat <redacted>
Wed, 2 Sep 2015 18:12:55 +0000 (14:12 -0400)
committerJunio C Hamano <redacted>
Wed, 2 Sep 2015 19:23:30 +0000 (12:23 -0700)
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t7060-wtstatus.sh

index a5b7a568bc60e49da317c2a525bdaff13f3e19d6..a886a4436f487bd112c21d5a42a8aec8e917400b 100755 (executable)
@@ -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
 '
 
git clone https://git.99rst.org/PROJECT