# [PATCH] t6019: avoid refname collision on case-insensitive systems 5 messages from 2011-09-15 to 2011-09-15. Participants: Thomas Rast, Brad King, Junio C Hamano, Jeff King. Thread: https://gitlist.dev/t/28396 ## Thomas Rast, 2011-09-15 08:34 Subject: [PATCH] t6019: avoid refname collision on case-insensitive systems Message-ID: <02451a2849fc8f1cab7983b6c8c629ebb6a1aaa9.1316075573.git.trast@student.ethz.ch> URL: https://gitlist.dev/e/02451a2849fc8f1cab7983b6c8c629ebb6a1aaa9.1316075573.git.trast%40student.ethz.ch ``` The criss-cross tests kept failing for me because of collisions of 'a' with 'A' etc. Prefix the lowercase refnames with an extra letter to disambiguate. Signed-off-by: Thomas Rast --- This fixes the tests on OS X. Together with Peff's fix to the poll issue, it now tests clean again. t/t6019-rev-list-ancestry-path.sh | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/t/t6019-rev-list-ancestry-path.sh b/t/t6019-rev-list-ancestry-path.sh index 738af73..39b4cb0 100755 --- a/t/t6019-rev-list-ancestry-path.sh +++ b/t/t6019-rev-list-ancestry-path.sh @@ -75,33 +75,36 @@ test_expect_success 'rev-list --ancestry-patch D..M -- M.t' ' # a X # \ / \ # c---cb +# +# All refnames prefixed with 'x' to avoid confusion with the tags +# generated by test_commit on case-insensitive systems. test_expect_success 'setup criss-cross' ' mkdir criss-cross && (cd criss-cross && git init && test_commit A && - git checkout -b b master && + git checkout -b xb master && test_commit B && - git checkout -b c master && + git checkout -b xc master && test_commit C && - git checkout -b bc b -- && - git merge c && - git checkout -b cb c -- && - git merge b && + git checkout -b xbc xb -- && + git merge xc && + git checkout -b xcb xc -- && + git merge xb && git checkout master) ' # no commits in bc descend from cb test_expect_success 'criss-cross: rev-list --ancestry-path cb..bc' ' (cd criss-cross && - git rev-list --ancestry-path cb..bc > actual && + git rev-list --ancestry-path xcb..xbc > actual && test -z "$(cat actual)") ' # no commits in repository descend from cb test_expect_success 'criss-cross: rev-list --ancestry-path --all ^cb' ' (cd criss-cross && - git rev-list --ancestry-path --all ^cb > actual && + git rev-list --ancestry-path --all ^xcb > actual && test -z "$(cat actual)") ' -- 1.7.7.rc1.366.ge210a6 ``` ## Brad King, 2011-09-15 12:45 Subject: Re: [PATCH] t6019: avoid refname collision on case-insensitive systems Message-ID: <4E71F37E.4030106@kitware.com> URL: https://gitlist.dev/e/4E71F37E.4030106%40kitware.com In-Reply-To: <02451a2849fc8f1cab7983b6c8c629ebb6a1aaa9.1316075573.git.trast@student.ethz.ch> ``` On 9/15/2011 4:34 AM, Thomas Rast wrote: > The criss-cross tests kept failing for me because of collisions of 'a' > with 'A' etc. Prefix the lowercase refnames with an extra letter to > disambiguate. Thanks. -Brad ``` ## Junio C Hamano, 2011-09-15 15:52 Subject: Re: [PATCH] t6019: avoid refname collision on case-insensitive systems Message-ID: <7vzki5pzvi.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vzki5pzvi.fsf%40alter.siamese.dyndns.org In-Reply-To: <02451a2849fc8f1cab7983b6c8c629ebb6a1aaa9.1316075573.git.trast@student.ethz.ch> ``` Thomas Rast writes: > The criss-cross tests kept failing for me because of collisions of 'a' > with 'A' etc. Prefix the lowercase refnames with an extra letter to > disambiguate. > > Signed-off-by: Thomas Rast > --- > > This fixes the tests on OS X. Together with Peff's fix to the poll > issue, it now tests clean again. Hmm, I must have misplaced Peff's poll fix. Care to point me in the right direction? ``` ## Jeff King, 2011-09-15 15:53 Subject: Re: [PATCH] t6019: avoid refname collision on case-insensitive systems Message-ID: <20110915155308.GA19667@sigill.intra.peff.net> URL: https://gitlist.dev/e/20110915155308.GA19667%40sigill.intra.peff.net In-Reply-To: <7vzki5pzvi.fsf@alter.siamese.dyndns.org> ``` On Thu, Sep 15, 2011 at 08:52:01AM -0700, Junio C Hamano wrote: > > This fixes the tests on OS X. Together with Peff's fix to the poll > > issue, it now tests clean again. > > Hmm, I must have misplaced Peff's poll fix. Care to point me in the right > direction? You have it already; it's part of the new http-auth commits I sent yesterday (patch 2/5). -Peff ``` ## Junio C Hamano, 2011-09-15 16:45 Subject: Re: [PATCH] t6019: avoid refname collision on case-insensitive systems Message-ID: <7vr53hpxe4.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vr53hpxe4.fsf%40alter.siamese.dyndns.org In-Reply-To: <20110915155308.GA19667@sigill.intra.peff.net> ``` Jeff King writes: > On Thu, Sep 15, 2011 at 08:52:01AM -0700, Junio C Hamano wrote: > >> > This fixes the tests on OS X. Together with Peff's fix to the poll >> > issue, it now tests clean again. >> >> Hmm, I must have misplaced Peff's poll fix. Care to point me in the right >> direction? > > You have it already; it's part of the new http-auth commits I sent > yesterday (patch 2/5). Ah, that one. Thanks, yes I do have it. I somehow thought Thomas was talking about a test fix for 5800 "intermittent hang". ```