{"thread":{"id":"28396","subject":"[PATCH] t6019: avoid refname collision on case-insensitive systems","startedAt":"2011-09-15T08:34:31Z","lastAt":"2011-09-15T16:45:39Z","messageCount":5,"participants":["Thomas Rast","Brad King","Junio C Hamano","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"175559","messageId":"02451a2849fc8f1cab7983b6c8c629ebb6a1aaa9.1316075573.git.trast@student.ethz.ch","threadId":"28396","inReplyTo":null,"subject":"[PATCH] t6019: avoid refname collision on case-insensitive systems","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2011-09-15T08:34:31Z","receivedAt":"2011-09-15T08:34:31Z","isPatch":true,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"The criss-cross tests kept failing for me because of collisions of 'a'\nwith 'A' etc. Prefix the lowercase refnames with an extra letter to\ndisambiguate.\n\nSigned-off-by: Thomas Rast \n---\n\nThis fixes the tests on OS X. Together with Peff's fix to the poll\nissue, it now tests clean again.\n\n\n t/t6019-rev-list-ancestry-path.sh | 19 +++++++++++--------\n 1 files changed, 11 insertions(+), 8 deletions(-)\n\ndiff --git a/t/t6019-rev-list-ancestry-path.sh b/t/t6019-rev-list-ancestry-path.sh\nindex 738af73..39b4cb0 100755\n--- a/t/t6019-rev-list-ancestry-path.sh\n+++ b/t/t6019-rev-list-ancestry-path.sh\n@@ -75,33 +75,36 @@ test_expect_success 'rev-list --ancestry-patch D..M -- M.t' '\n # a X\n # \\ / \\\n # c---cb\n+#\n+# All refnames prefixed with 'x' to avoid confusion with the tags\n+# generated by test_commit on case-insensitive systems.\n test_expect_success 'setup criss-cross' '\n \tmkdir criss-cross &&\n \t(cd criss-cross &&\n \t git init &&\n \t test_commit A &&\n-\t git checkout -b b master &&\n+\t git checkout -b xb master &&\n \t test_commit B &&\n-\t git checkout -b c master &&\n+\t git checkout -b xc master &&\n \t test_commit C &&\n-\t git checkout -b bc b -- &&\n-\t git merge c &&\n-\t git checkout -b cb c -- &&\n-\t git merge b &&\n+\t git checkout -b xbc xb -- &&\n+\t git merge xc &&\n+\t git checkout -b xcb xc -- &&\n+\t git merge xb &&\n \t git checkout master)\n '\n \n # no commits in bc descend from cb\n test_expect_success 'criss-cross: rev-list --ancestry-path cb..bc' '\n \t(cd criss-cross &&\n-\t git rev-list --ancestry-path cb..bc > actual &&\n+\t git rev-list --ancestry-path xcb..xbc > actual &&\n \t test -z \"$(cat actual)\")\n '\n \n # no commits in repository descend from cb\n test_expect_success 'criss-cross: rev-list --ancestry-path --all ^cb' '\n \t(cd criss-cross &&\n-\t git rev-list --ancestry-path --all ^cb > actual &&\n+\t git rev-list --ancestry-path --all ^xcb > actual &&\n \t test -z \"$(cat actual)\")\n '\n \n-- \n1.7.7.rc1.366.ge210a6\n"},{"id":"175576","messageId":"4E71F37E.4030106@kitware.com","threadId":"28396","inReplyTo":"02451a2849fc8f1cab7983b6c8c629ebb6a1aaa9.1316075573.git.trast@student.ethz.ch","subject":"Re: [PATCH] t6019: avoid refname collision on case-insensitive systems","fromName":"Brad King","fromEmail":"brad.king@kitware.com","sentAt":"2011-09-15T12:45:50Z","receivedAt":"2011-09-15T12:45:50Z","isPatch":true,"sender":{"key":"brad.king@kitware.com","avatar":"https://avatars.githubusercontent.com/u/87268?v=4"},"body":"On 9/15/2011 4:34 AM, Thomas Rast wrote:\n> The criss-cross tests kept failing for me because of collisions of 'a'\n> with 'A' etc. Prefix the lowercase refnames with an extra letter to\n> disambiguate.\n\nThanks.\n\n-Brad\n"},{"id":"175587","messageId":"7vzki5pzvi.fsf@alter.siamese.dyndns.org","threadId":"28396","inReplyTo":"02451a2849fc8f1cab7983b6c8c629ebb6a1aaa9.1316075573.git.trast@student.ethz.ch","subject":"Re: [PATCH] t6019: avoid refname collision on case-insensitive systems","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-09-15T15:52:01Z","receivedAt":"2011-09-15T15:52:01Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thomas Rast writes:\n\n> The criss-cross tests kept failing for me because of collisions of 'a'\n> with 'A' etc. Prefix the lowercase refnames with an extra letter to\n> disambiguate.\n>\n> Signed-off-by: Thomas Rast \n> ---\n>\n> This fixes the tests on OS X. Together with Peff's fix to the poll\n> issue, it now tests clean again.\n\nHmm, I must have misplaced Peff's poll fix. Care to point me in the right\ndirection?\n"},{"id":"175588","messageId":"20110915155308.GA19667@sigill.intra.peff.net","threadId":"28396","inReplyTo":"7vzki5pzvi.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] t6019: avoid refname collision on case-insensitive systems","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2011-09-15T15:53:08Z","receivedAt":"2011-09-15T15:53:08Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Sep 15, 2011 at 08:52:01AM -0700, Junio C Hamano wrote:\n\n> > This fixes the tests on OS X. Together with Peff's fix to the poll\n> > issue, it now tests clean again.\n> \n> Hmm, I must have misplaced Peff's poll fix. Care to point me in the right\n> direction?\n\nYou have it already; it's part of the new http-auth commits I sent\nyesterday (patch 2/5).\n\n-Peff\n"},{"id":"175590","messageId":"7vr53hpxe4.fsf@alter.siamese.dyndns.org","threadId":"28396","inReplyTo":"20110915155308.GA19667@sigill.intra.peff.net","subject":"Re: [PATCH] t6019: avoid refname collision on case-insensitive systems","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-09-15T16:45:39Z","receivedAt":"2011-09-15T16:45:39Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Thu, Sep 15, 2011 at 08:52:01AM -0700, Junio C Hamano wrote:\n>\n>> > This fixes the tests on OS X. Together with Peff's fix to the poll\n>> > issue, it now tests clean again.\n>> \n>> Hmm, I must have misplaced Peff's poll fix. Care to point me in the right\n>> direction?\n>\n> You have it already; it's part of the new http-auth commits I sent\n> yesterday (patch 2/5).\n\nAh, that one. Thanks, yes I do have it.\n\nI somehow thought Thomas was talking about a test fix for 5800\n\"intermittent hang\".\n"}]}