* [PATCH] t7060: actually test "git diff-index --cached -M"
@ 2015-09-02 18:12 Matthieu Prat
2015-09-02 19:24 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Matthieu Prat @ 2015-09-02 18:12 UTC (permalink / raw)
To: gitster; +Cc: git
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] t7060: actually test "git diff-index --cached -M"
2015-09-02 18:12 [PATCH] t7060: actually test "git diff-index --cached -M" Matthieu Prat
@ 2015-09-02 19:24 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2015-09-02 19:24 UTC (permalink / raw)
To: Matthieu Prat; +Cc: git
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-09-02 19:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-02 18:12 [PATCH] t7060: actually test "git diff-index --cached -M" Matthieu Prat
2015-09-02 19:24 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox