threads / patch / 17563

patcht3411: Fix ambiguous filename/tagname in setup

Subject: [PATCH] t3411: Fix ambiguous filename/tagname in setup

## tl;dr

3 messages between Feb 4, 2009 and Feb 5, 2009. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Arjen Laarhoven· Feb 4, 2009, 19:42 UTC · lore

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(-)

Show changes to t/t3411-rebase-preserve-around-merges.sh +1 −1

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

Johannes Schindelin· Feb 4, 2009, 20:31 UTC · re: Arjen Laarhoven · lore

Re: [PATCH] t3411: Fix ambiguous filename/tagname in setup

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

Arjen Laarhoven· Feb 5, 2009, 07:45 UTC · re: Johannes Schindelin · lore

Re: [PATCH] t3411: Fix ambiguous filename/tagname in setup

On Wed, Feb 04, 2009 at 09:31:42PM +0100, Johannes Schindelin wrote:

Show 10 quoted lines

> 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"