# [PATCH] t7060: actually test "git diff-index --cached -M" 2 messages from 2015-09-02 to 2015-09-02. Participants: Matthieu Prat, Junio C Hamano. Thread: https://gitlist.dev/t/40250 ## Matthieu Prat, 2015-09-02 18:12 Subject: [PATCH] t7060: actually test "git diff-index --cached -M" Message-ID: <1441217575-45474-1-git-send-email-matthieuprat@gmail.com> URL: https://gitlist.dev/e/1441217575-45474-1-git-send-email-matthieuprat%40gmail.com ``` 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 --- 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 ``` ## Junio C Hamano, 2015-09-02 19:24 Subject: Re: [PATCH] t7060: actually test "git diff-index --cached -M" Message-ID: URL: https://gitlist.dev/e/xmqqtwrcmxp4.fsf%40gitster.mtv.corp.google.com In-Reply-To: <1441217575-45474-1-git-send-email-matthieuprat@gmail.com> ``` Matthieu Prat 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. ```