Git development
 help / color / mirror / Atom feed
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
To: git@vger.kernel.org
Cc: Jeremy Huddleston Sequoia <jeremyhu@apple.com>,
	Thomas Gummerer <t.gummerer@gmail.com>,
	Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] t3700-add.sh: Avoid filename collission between tests which could lead to test failure
Date: Sun,  9 Oct 2016 20:57:56 -0700	[thread overview]
Message-ID: <20161010035756.38408-1-jeremyhu@apple.com> (raw)

Regressed-in: 610d55af0f082f6b866dc858e144c03d8ed4424c
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
CC: Thomas Gummerer <t.gummerer@gmail.com>
CC: Junio C Hamano <gitster@pobox.com>
---
 t/t3700-add.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 924a266..3ccb19b 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -354,11 +354,11 @@ test_expect_success 'git add --chmod=[+-]x changes index with already added file
 	git add foo3 &&
 	git add --chmod=+x foo3 &&
 	test_mode_in_index 100755 foo3 &&
-	echo foo >xfoo3 &&
-	chmod 755 xfoo3 &&
-	git add xfoo3 &&
-	git add --chmod=-x xfoo3 &&
-	test_mode_in_index 100644 xfoo3
+	echo foo >xfoo4 &&
+	chmod 755 xfoo4 &&
+	git add xfoo4 &&
+	git add --chmod=-x xfoo4 &&
+	test_mode_in_index 100644 xfoo4
 '
 
 test_expect_success POSIXPERM 'git add --chmod=[+-]x does not change the working tree' '
-- 
2.10.1


             reply	other threads:[~2016-10-10  3:58 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-10  3:57 Jeremy Huddleston Sequoia [this message]
2016-10-10 16:44 ` [PATCH] t3700-add.sh: Avoid filename collission between tests which could lead to test failure Junio C Hamano
2016-10-10 17:09   ` Jeremy Huddleston Sequoia

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=20161010035756.38408-1-jeremyhu@apple.com \
    --to=jeremyhu@apple.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=t.gummerer@gmail.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