# [PATCH] t3411: Fix ambiguous filename/tagname in setup 3 messages from 2009-02-04 to 2009-02-05. Participants: Arjen Laarhoven, Johannes Schindelin. Thread: https://gitlist.dev/t/17563 ## Arjen Laarhoven, 2009-02-04 19:42 Subject: [PATCH] t3411: Fix ambiguous filename/tagname in setup Message-ID: <1233776556-9047-1-git-send-email-arjen@yaph.org> URL: https://gitlist.dev/e/1233776556-9047-1-git-send-email-arjen%40yaph.org ``` 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 --- 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 ``` ## Johannes Schindelin, 2009-02-04 20:31 Subject: Re: [PATCH] t3411: Fix ambiguous filename/tagname in setup Message-ID: URL: https://gitlist.dev/e/alpine.DEB.1.00.0902042131130.10279%40pacific.mpi-cbg.de In-Reply-To: <1233776556-9047-1-git-send-email-arjen@yaph.org> ``` 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, 2009-02-05 07:45 Subject: Re: [PATCH] t3411: Fix ambiguous filename/tagname in setup Message-ID: <20090205074539.GA10795@regex.yaph.org> URL: https://gitlist.dev/e/20090205074539.GA10795%40regex.yaph.org In-Reply-To: ``` 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" ```