{"thread":{"id":"40250","subject":"[PATCH] t7060: actually test \"git diff-index --cached -M\"","startedAt":"2015-09-02T18:12:55Z","lastAt":"2015-09-02T19:24:23Z","messageCount":2,"participants":["Matthieu Prat","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"269226","messageId":"1441217575-45474-1-git-send-email-matthieuprat@gmail.com","threadId":"40250","inReplyTo":null,"subject":"[PATCH] t7060: actually test \"git diff-index --cached -M\"","fromName":"Matthieu Prat","fromEmail":"matthieuprat@gmail.com","sentAt":"2015-09-02T18:12:55Z","receivedAt":"2015-09-02T18:12:55Z","isPatch":true,"sender":{"key":"matthieuprat@gmail.com","avatar":null},"body":"A test was designed for \"git diff-index --cached -M\" but the command is\nrun without the \"-M\" option (which makes the test essentially identical\nto its preceding counterpart).\n\nGive the command the option it deserves and the test a raison d'être.\n\nSigned-off-by: Matthieu Prat <matthieuprat@gmail.com>\n---\n t/t7060-wtstatus.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh\nindex 741ec08..32d8176 100755\n--- a/t/t7060-wtstatus.sh\n+++ b/t/t7060-wtstatus.sh\n@@ -106,7 +106,7 @@ test_expect_success 'git diff-index --cached -M shows 2 added + 1 unmerged' '\n \tA\tTHREE\n \tA\tTWO\n \tEOF\n-\tgit diff-index --cached --name-status HEAD >actual &&\n+\tgit diff-index --cached -M --name-status HEAD >actual &&\n \ttest_cmp expected actual\n '\n \n-- \n2.5.0\n"},{"id":"269228","messageId":"xmqqtwrcmxp4.fsf@gitster.mtv.corp.google.com","threadId":"40250","inReplyTo":"1441217575-45474-1-git-send-email-matthieuprat@gmail.com","subject":"Re: [PATCH] t7060: actually test \"git diff-index --cached -M\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-09-02T19:24:23Z","receivedAt":"2015-09-02T19:24:23Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthieu Prat <matthieuprat@gmail.com> writes:\n\n> A test was designed for \"git diff-index --cached -M\" but the command is\n> run without the \"-M\" option (which makes the test essentially identical\n> to its preceding counterpart).\n\nVery true and it seems that it has been that way from the day these\ntrio of tests were introduced by d7c9bf22 (diffcore-rename: don't\nconsider unmerged path as source, 2011-03-23).\n\nThanks for a fix.  Will queue.\n"}]}