* [PATCH] t3411: Fix ambiguous filename/tagname in setup
@ 2009-02-04 19:42 Arjen Laarhoven
2009-02-04 20:31 ` Johannes Schindelin
0 siblings, 1 reply; 3+ messages in thread
From: Arjen Laarhoven @ 2009-02-04 19:42 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] t3411: Fix ambiguous filename/tagname in setup
2009-02-04 19:42 [PATCH] t3411: Fix ambiguous filename/tagname in setup Arjen Laarhoven
@ 2009-02-04 20:31 ` Johannes Schindelin
2009-02-05 7:45 ` Arjen Laarhoven
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Schindelin @ 2009-02-04 20:31 UTC (permalink / raw)
To: Arjen Laarhoven; +Cc: Junio C Hamano, git
Hi,
On Wed, 4 Feb 2009, Arjen Laarhoven wrote:
> 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.
Wasn't this just fixed by Junio, after a discussion between Brian, Junio
and me?
Ciao,
Dscho
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] t3411: Fix ambiguous filename/tagname in setup
2009-02-04 20:31 ` Johannes Schindelin
@ 2009-02-05 7:45 ` Arjen Laarhoven
0 siblings, 0 replies; 3+ messages in thread
From: Arjen Laarhoven @ 2009-02-05 7:45 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Junio C Hamano, git
On Wed, Feb 04, 2009 at 09:31:42PM +0100, Johannes Schindelin wrote:
> Hi,
>
> On Wed, 4 Feb 2009, Arjen Laarhoven wrote:
>
> > 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.
>
> Wasn't this just fixed by Junio, after a discussion between Brian, Junio
> and me?
Yup, sorry for the noise, I've missed that thread.
Arjen
--
Arjen Laarhoven
The presence of those seeking the truth is infinitely to be preferred to
those who think they've found it.
-- Terry Pratchett, "Monstrous Regiment"
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-02-05 8:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-04 19:42 [PATCH] t3411: Fix ambiguous filename/tagname in setup Arjen Laarhoven
2009-02-04 20:31 ` Johannes Schindelin
2009-02-05 7:45 ` Arjen Laarhoven
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).