diff options
| author |  Matthieu Prat <matthieuprat@gmail.com> | 2015-09-02 14:12:55 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-09-02 12:23:30 -0700 |
| commit | b894d3e7881cf48770a25fb16a90310afa30834f (patch) | |
| tree | 768153d448df860aba5cdcfff606e5e2236b7a53 | |
| parent | diffcore-rename: don't consider unmerged path as source (diff) | |
| download | tgif-b894d3e7881cf48770a25fb16a90310afa30834f.tar.xz | |
t7060: actually test "git diff-index --cached -M"
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-x | t/t7060-wtstatus.sh | 2 |
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 ' |