diff options
| author |  Thomas Rast <trast@student.ethz.ch> | 2011-09-15 10:34:31 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-09-15 08:53:11 -0700 |
| commit | c05b988a69c10d7eef2f34932eed61923c18b4a5 (patch) | |
| tree | 08f6c8bf2a489092f1243960f17e4e5ec508507d | |
| parent | revision: do not include sibling history in --ancestry-path output (diff) | |
| download | tgif-c05b988a69c10d7eef2f34932eed61923c18b4a5.tar.xz | |
t6019: avoid refname collision on case-insensitive systems
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>
Acked-by: Brad King <brad.king@kitware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | 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 738af73393..39b4cb0ecd 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)") ' |