git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Rast <trast@student.ethz.ch>
To: Junio C Hamano <gitster@pobox.com>
Cc: Brad King <brad.king@kitware.com>, <git@vger.kernel.org>
Subject: [PATCH] t6019: avoid refname collision on case-insensitive systems
Date: Thu, 15 Sep 2011 10:34:31 +0200	[thread overview]
Message-ID: <02451a2849fc8f1cab7983b6c8c629ebb6a1aaa9.1316075573.git.trast@student.ethz.ch> (raw)

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 <trast@student.ethz.ch>
---

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

             reply	other threads:[~2011-09-15  8:34 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-15  8:34 Thomas Rast [this message]
2011-09-15 12:45 ` [PATCH] t6019: avoid refname collision on case-insensitive systems Brad King
2011-09-15 15:52 ` Junio C Hamano
2011-09-15 15:53   ` Jeff King
2011-09-15 16:45     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=02451a2849fc8f1cab7983b6c8c629ebb6a1aaa9.1316075573.git.trast@student.ethz.ch \
    --to=trast@student.ethz.ch \
    --cc=brad.king@kitware.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).