Git development
 help / color / mirror / Atom feed
From: Matthieu Prat <matthieuprat@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org
Subject: [PATCH] t7060: actually test "git diff-index --cached -M"
Date: Wed,  2 Sep 2015 14:12:55 -0400	[thread overview]
Message-ID: <1441217575-45474-1-git-send-email-matthieuprat@gmail.com> (raw)

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

             reply	other threads:[~2015-09-02 18:13 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-02 18:12 Matthieu Prat [this message]
2015-09-02 19:24 ` [PATCH] t7060: actually test "git diff-index --cached -M" Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1441217575-45474-1-git-send-email-matthieuprat@gmail.com \
    --to=matthieuprat@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox