From: Arjen Laarhoven <arjen@yaph.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH] t3411: Fix ambiguous filename/tagname in setup
Date: Wed, 4 Feb 2009 20:42:36 +0100 [thread overview]
Message-ID: <1233776556-9047-1-git-send-email-arjen@yaph.org> (raw)
After commit 37e5c8f (Simplify t3411) the test setup fails on
case-insensitive filesystems because 'git reset' can't disambiguate the
filenames and tagnames. An explicit '--' to 'git reset' fixes this.
Signed-off-by: Arjen Laarhoven <arjen@yaph.org>
---
t/t3411-rebase-preserve-around-merges.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t3411-rebase-preserve-around-merges.sh b/t/t3411-rebase-preserve-around-merges.sh
index 6533505..e544451 100755
--- a/t/t3411-rebase-preserve-around-merges.sh
+++ b/t/t3411-rebase-preserve-around-merges.sh
@@ -24,7 +24,7 @@ test_expect_success 'setup' '
test_commit A1 &&
test_commit B1 &&
test_commit C1 &&
- git reset --hard B1 &&
+ git reset --hard B1 -- &&
test_commit D1 &&
test_merge E1 C1 &&
test_commit F1
--
1.6.1.2.467.g081e7
next reply other threads:[~2009-02-04 19:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-04 19:42 Arjen Laarhoven [this message]
2009-02-04 20:31 ` [PATCH] t3411: Fix ambiguous filename/tagname in setup Johannes Schindelin
2009-02-05 7:45 ` Arjen Laarhoven
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=1233776556-9047-1-git-send-email-arjen@yaph.org \
--to=arjen@yaph.org \
--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;
as well as URLs for NNTP newsgroup(s).