3 # Copyright (c) 2019 Denton Liu
6 test_description
='ensure rebase fast-forwards commits when possible'
10 test_expect_success setup
'
15 git checkout -t -b side
18 test_rebase_same_head
() {
31 test_rebase_same_head_
$status_n $what_n $cmp_n "" "$*" &&
32 test_rebase_same_head_
$status_f $what_f $cmp_f " --no-ff" "$*"
35 test_rebase_same_head_
() {
44 test_expect_
$status "git rebase$flag $* with $changes is $what with $cmp HEAD" "
45 oldhead=\$(git rev-parse HEAD) &&
46 test_when_finished 'git reset --hard \$oldhead' &&
47 git rebase$flag $* >stdout &&
50 # Must check this case first, for 'is up to
51 # date, rebase forced[...]rewinding head' cases
52 test_i18ngrep 'rewinding head' stdout
53 elif test $what = noop
55 test_i18ngrep 'is up to date' stdout &&
56 test_i18ngrep ! 'rebase forced' stdout
57 elif test $what = noop-force
59 test_i18ngrep 'is up to date, rebase forced' stdout
61 newhead=\$(git rev-parse HEAD) &&
64 test_cmp_rev \$oldhead \$newhead
67 ! test_cmp_rev \$oldhead \$newhead
73 test_rebase_same_head success work same success work same
74 test_rebase_same_head success noop same success noop-force same master
75 test_rebase_same_head success noop same success noop-force
diff --onto B B
76 test_rebase_same_head success noop same success noop-force
diff --onto B... B
77 test_rebase_same_head success noop same success noop-force same
--onto master... master
78 test_rebase_same_head success noop same success noop-force same
--no-fork-point
79 test_rebase_same_head success work same success work same
--fork-point master
80 test_rebase_same_head failure noop same success work
diff --fork-point --onto B B
81 test_rebase_same_head failure work same success work
diff --fork-point --onto B... B
82 test_rebase_same_head success work same success work same
--fork-point --onto master... master
84 test_expect_success
'add work same to side' '
89 test_rebase_same_head success work same success work same
90 test_rebase_same_head success noop same success noop-force same master
91 test_rebase_same_head success noop same success noop-force
diff --onto B B
92 test_rebase_same_head success noop same success noop-force
diff --onto B... B
93 test_rebase_same_head success noop same success noop-force same
--onto master... master
94 test_rebase_same_head success noop same success noop-force same
--no-fork-point
95 test_rebase_same_head success work same success work same
--fork-point master
96 test_rebase_same_head failure work same success work
diff --fork-point --onto B B
97 test_rebase_same_head failure work same success work
diff --fork-point --onto B... B
98 test_rebase_same_head success work same success work same
--fork-point --onto master... master
100 test_expect_success
'add work same to upstream' '
101 git checkout master &&
106 changes
='our and their changes'
107 test_rebase_same_head success noop same success noop-force
diff --onto B B
108 test_rebase_same_head success noop same success noop-force
diff --onto B... B
109 test_rebase_same_head success noop same success work
diff --onto master... master
110 test_rebase_same_head failure work same success work
diff --fork-point --onto B B
111 test_rebase_same_head failure work same success work
diff --fork-point --onto B... B
112 test_rebase_same_head success noop same success work
diff --fork-point --onto master... master