threads / patch / 40250

patcht7060: actually test "git diff-index --cached -M"

Subject: [PATCH] t7060: actually test "git diff-index --cached -M"

## tl;dr

2 messages between Sep 2, 2015 and Sep 2, 2015. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Matthieu Prat· Sep 2, 2015, 18:12 UTC · lore

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).

Give the command the option it deserves and the test a raison d'être.

Signed-off-by: Matthieu Prat <matthieuprat@gmail.com>
---
 t/t7060-wtstatus.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to t/t7060-wtstatus.sh +1 −1

diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index 741ec08..32d8176 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
 '

-- 
2.5.0

Junio C Hamano· Sep 2, 2015, 19:24 UTC · re: Matthieu Prat · lore

Re: [PATCH] t7060: actually test "git diff-index --cached -M"

Matthieu Prat <matthieuprat@gmail.com> writes:

> 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).

Very true and it seems that it has been that way from the day these trio of tests were introduced by d7c9bf22 (diffcore-rename: don't consider unmerged path as source, 2011-03-23).

Thanks for a fix.  Will queue.