3 test_description
='git rebase --onto A...B'
5 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
=main
6 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
9 .
"$TEST_DIRECTORY/lib-rebase.sh"
11 # Rebase only the tip commit of "topic" on merge base between "main"
12 # and "topic". Cannot do this for "side" with "main" because there
13 # is no single merge base.
18 # A---B---C---D---E main --> A---B---C---D---E
24 test_expect_success setup
'
48 test_expect_success
'rebase --onto main...topic' '
53 git rebase --onto main...topic F &&
54 git rev-parse HEAD^1 >actual &&
55 git rev-parse C^0 >expect &&
56 test_cmp expect actual
59 test_expect_success
'rebase --onto main...' '
64 git rebase --onto main... F &&
65 git rev-parse HEAD^1 >actual &&
66 git rev-parse C^0 >expect &&
67 test_cmp expect actual
70 test_expect_success
'rebase --onto main...side' '
75 test_must_fail git rebase --onto main...side J
78 test_expect_success
'rebase -i --onto main...topic' '
83 EXPECT_COUNT=1 git rebase -i --onto main...topic F &&
84 git rev-parse HEAD^1 >actual &&
85 git rev-parse C^0 >expect &&
86 test_cmp expect actual
89 test_expect_success
'rebase -i --onto main...' '
94 EXPECT_COUNT=1 git rebase -i --onto main... F &&
95 git rev-parse HEAD^1 >actual &&
96 git rev-parse C^0 >expect &&
97 test_cmp expect actual
100 test_expect_success
'rebase -i --onto main...side' '
103 git reset --hard K &&
106 test_must_fail git rebase -i --onto main...side J
109 test_expect_success
'rebase --keep-base --onto incompatible' '
110 test_must_fail git rebase --keep-base --onto main...
113 test_expect_success
'rebase --keep-base --root incompatible' '
114 test_must_fail git rebase --keep-base --root
117 test_expect_success
'rebase --keep-base main from topic' '
119 git checkout topic &&
120 git reset --hard G &&
122 git rebase --keep-base main &&
123 git rev-parse C >base.expect &&
124 git merge-base main HEAD >base.actual &&
125 test_cmp base.expect base.actual &&
127 git rev-parse HEAD~2 >actual &&
128 git rev-parse C^0 >expect &&
129 test_cmp expect actual
132 test_expect_success
'rebase --keep-base main topic from main' '
134 git branch -f topic G &&
136 git rebase --keep-base main topic &&
137 git rev-parse C >base.expect &&
138 git merge-base main HEAD >base.actual &&
139 test_cmp base.expect base.actual &&
141 git rev-parse HEAD~2 >actual &&
142 git rev-parse C^0 >expect &&
143 test_cmp expect actual
146 test_expect_success
'rebase --keep-base main from side' '
149 git reset --hard K &&
151 test_must_fail git rebase --keep-base main
154 test_expect_success
'rebase -i --keep-base main from topic' '
156 git checkout topic &&
157 git reset --hard G &&
160 EXPECT_COUNT=2 git rebase -i --keep-base main &&
161 git rev-parse C >base.expect &&
162 git merge-base main HEAD >base.actual &&
163 test_cmp base.expect base.actual &&
165 git rev-parse HEAD~2 >actual &&
166 git rev-parse C^0 >expect &&
167 test_cmp expect actual
170 test_expect_success
'rebase -i --keep-base main topic from main' '
172 git branch -f topic G &&
175 EXPECT_COUNT=2 git rebase -i --keep-base main topic &&
176 git rev-parse C >base.expect &&
177 git merge-base main HEAD >base.actual &&
178 test_cmp base.expect base.actual &&
180 git rev-parse HEAD~2 >actual &&
181 git rev-parse C^0 >expect &&
182 test_cmp expect actual
185 test_expect_success
'rebase -i --keep-base main from side' '
188 git reset --hard K &&
191 test_must_fail git rebase -i --keep-base main