mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
c9581cc800
commit
984f78d278
|
@ -79,9 +79,9 @@ test_run_rebase success -p
|
|||
# /
|
||||
# a---b---c---g---h
|
||||
# \
|
||||
# d---G---i
|
||||
# d---gp--i
|
||||
#
|
||||
# uppercase = cherry-picked
|
||||
# gp = cherry-picked g
|
||||
# h = reverted g
|
||||
#
|
||||
# Reverted patches are there for tests to be able to check if a commit
|
||||
|
@ -94,7 +94,7 @@ test_expect_success 'setup of linear history for range selection tests' '
|
|||
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
|
||||
|
@ -120,7 +120,7 @@ test_run_rebase () {
|
|||
shift
|
||||
test_expect_$result "rebase $* can drop last patch if in upstream" "
|
||||
reset_rebase &&
|
||||
git rebase $* h G &&
|
||||
git rebase $* h gp &&
|
||||
test_cmp_rev h HEAD^ &&
|
||||
test_linear_range 'd' h..
|
||||
"
|
||||
|
@ -152,7 +152,7 @@ test_run_rebase () {
|
|||
reset_rebase &&
|
||||
git rebase $* --onto h f i &&
|
||||
test_cmp_rev h HEAD~3 &&
|
||||
test_linear_range 'd G i' h..
|
||||
test_linear_range 'd gp i' h..
|
||||
"
|
||||
}
|
||||
test_run_rebase success ''
|
||||
|
@ -222,9 +222,9 @@ test_run_rebase failure -p
|
|||
# /
|
||||
# a---b---c---g
|
||||
#
|
||||
# x---y---B
|
||||
# x---y---bp
|
||||
#
|
||||
# uppercase = cherry-picked
|
||||
# bp = cherry-picked b
|
||||
# m = reverted b
|
||||
#
|
||||
# Reverted patches are there for tests to be able to check if a commit
|
||||
|
@ -239,7 +239,7 @@ test_expect_success 'setup of linear history for test involving root' '
|
|||
git rm -rf . &&
|
||||
test_commit x &&
|
||||
test_commit y &&
|
||||
cherry_pick B b
|
||||
cherry_pick bp b
|
||||
'
|
||||
|
||||
test_run_rebase () {
|
||||
|
@ -277,7 +277,7 @@ test_run_rebase () {
|
|||
shift
|
||||
test_expect_$result "rebase $* --onto --root drops patch in onto" "
|
||||
reset_rebase &&
|
||||
git rebase $* --onto m --root B &&
|
||||
git rebase $* --onto m --root bp &&
|
||||
test_cmp_rev m HEAD~2 &&
|
||||
test_linear_range 'x y' m..
|
||||
"
|
||||
|
@ -308,7 +308,7 @@ test_run_rebase () {
|
|||
shift
|
||||
test_expect_$result "rebase $* without --onto --root with disjoint history drops patch in onto" "
|
||||
reset_rebase &&
|
||||
git rebase $* m B &&
|
||||
git rebase $* m bp &&
|
||||
test_cmp_rev m HEAD~2 &&
|
||||
test_linear_range 'x y' m..
|
||||
"
|
||||
|
|
|
@ -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" "
|
||||
|
|
Loading…
Reference in a new issue