diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2013-06-18 09:28:07 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-18 07:40:31 -0700 |
| commit | 984f78d278dd456b12874da1bdf3763e72db8dae (patch) | |
| tree | 599a3dbd546a20289c74bae172c8f49e3cb34e36 /t/t3425-rebase-topology-merges.sh | |
| parent | c9581cc8005d54680512cc6f22255b6847176f2b (diff) | |
| download | git-984f78d278dd456b12874da1bdf3763e72db8dae.tar.gz | |
rebase topology tests: fix commit names on case-insensitive file systems
The recently introduced tests used uppercase letters to denote
cherry-picks of commits having the corresponding lowercase letter names.
The helper functions also set up tags with the names of the commits.
But this constellation fails on case-insensitive file systems because
there cannot be distinct tags with names that differ only in case.
Use a less subtle convention for the names of cherry-picked commits.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3425-rebase-topology-merges.sh')
| -rwxr-xr-x | t/t3425-rebase-topology-merges.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/t/t3425-rebase-topology-merges.sh b/t/t3425-rebase-topology-merges.sh index 5400a059e4..1d195fbd64 100755 --- a/t/t3425-rebase-topology-merges.sh +++ b/t/t3425-rebase-topology-merges.sh @@ -30,7 +30,7 @@ test_expect_success 'setup of non-linear-history' ' test_commit g && revert h g && git checkout d && - cherry_pick G g && + cherry_pick gp g && test_commit i && git checkout b && test_commit f @@ -154,11 +154,11 @@ test_expect_success "rebase -p can re-create two branches on onto" " # / # a---b---c---g---h # \ -# d---G---i +# d---gp--i # \ \ # e-------u # -# uppercase = cherry-picked +# gp = cherry-picked g # h = reverted g test_expect_success 'setup of non-linear-history for patch-equivalence tests' ' git checkout e && @@ -186,24 +186,24 @@ test_expect_success "rebase -p --onto in merged history does not drop patches in git rebase -p --onto h f u && test_cmp_rev h HEAD~3 && test_cmp_rev HEAD^2~2 HEAD~2 && - test_revision_subjects 'd G i e u' HEAD~2 HEAD^2^ HEAD^2 HEAD^ HEAD + test_revision_subjects 'd gp i e u' HEAD~2 HEAD^2^ HEAD^2 HEAD^ HEAD " # a---b---c---g---h # \ -# d---G---s +# d---gp--s # \ \ / # \ X # \ / \ # e---t # -# uppercase = cherry-picked +# gp = cherry-picked g # h = reverted g test_expect_success 'setup of non-linear-history for dropping whole side' ' - git checkout G && + git checkout gp && test_merge s e && git checkout e && - test_merge t G + test_merge t gp ' test_expect_failure "rebase -p drops merge commit when entire first-parent side is dropped" " |