3 # Copyright (c) 2018 Johannes E. Schindelin
6 test_description
='git rebase -i --rebase-merges
8 This test runs git rebase "interactively", retaining the branch structure by
9 recreating merge commits.
15 A - C - D - E - H (master)
22 .
"$TEST_DIRECTORY"/lib-rebase.sh
26 git log
--graph --boundary --format=%s
"$@" >output
&&
27 sed "s/ *$//" <output
>output.trimmed
&&
28 test_cmp expect output.trimmed
31 test_expect_success
'setup' '
32 write_script replace-editor.sh <<-\EOF &&
33 mv "$1" "$(git rev-parse --git-path ORIGINAL-TODO)"
34 cp script-from-scratch "$1"
38 git checkout -b first &&
40 git checkout master &&
43 git merge --no-commit B &&
47 git checkout -b second C &&
50 git checkout master &&
51 git merge --no-commit G &&
56 test_commit conflicting-G G.t
59 test_expect_success
'create completely different structure' '
60 cat >script-from-scratch <<-\EOF &&
75 merge onebranch # Merge the topic branch '\''onebranch'\''
77 test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
79 git rebase -i -r A master &&
80 test_cmp_graph <<-\EOF
81 * Merge the topic branch '\''onebranch'\''
95 test_expect_success
'generate correct todo list' '
96 cat >expect <<-\EOF &&
110 reset branch-point # C
112 merge -C 2051b56 E # E
113 merge -C 233d48a H # H
117 grep -v "^#" <.git/ORIGINAL-TODO >output &&
118 test_cmp expect output
121 test_expect_success
'`reset` refuses to overwrite untracked files' '
122 git checkout -b refuse-to-reset &&
123 test_commit dont-overwrite-untracked &&
124 git checkout @{-1} &&
125 : >dont-overwrite-untracked.t &&
126 echo "reset refs/tags/dont-overwrite-untracked" >script-from-scratch &&
127 test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
128 test_must_fail git rebase -r HEAD &&
132 test_expect_success
'failed `merge` writes patch (may be rescheduled, too)' '
133 test_when_finished "test_might_fail git rebase --abort" &&
134 git checkout -b conflicting-merge A &&
136 : fail because of conflicting untracked file &&
138 echo "merge -C H G" >script-from-scratch &&
139 test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
141 test_must_fail git rebase -ir HEAD &&
142 grep "^merge -C .* G$" .git/rebase-merge/done &&
143 grep "^merge -C .* G$" .git/rebase-merge/git-rebase-todo &&
144 test_path_is_file .git/rebase-merge/patch &&
146 : fail because of merge conflict &&
147 rm G.t .git/rebase-merge/patch &&
148 git reset --hard conflicting-G &&
149 test_must_fail git rebase --continue &&
150 ! grep "^merge -C .* G$" .git/rebase-merge/git-rebase-todo &&
151 test_path_is_file .git/rebase-merge/patch
154 test_expect_success
'with a branch tip that was cherry-picked already' '
155 git checkout -b already-upstream master &&
156 base="$(git rev-parse --verify HEAD)" &&
160 git reset --hard $base &&
163 git merge -m "Merge branch A" A2 &&
165 git checkout -b upstream-with-a2 $base &&
167 git cherry-pick A2 &&
169 git checkout already-upstream &&
171 git rebase -i -r upstream-with-a2 &&
172 test_cmp_graph upstream-with-a2.. <<-\EOF
182 test_expect_success
'do not rebase cousins unless asked for' '
183 git checkout -b cousins master &&
184 before="$(git rev-parse --verify HEAD)" &&
186 git rebase -r HEAD^ &&
187 test_cmp_rev HEAD $before &&
189 git rebase --rebase-merges=rebase-cousins HEAD^ &&
190 test_cmp_graph HEAD^.. <<-\EOF
191 * Merge the topic branch '\''onebranch'\''
200 test_expect_success
'refs/rewritten/* is worktree-local' '
201 git worktree add wt &&
202 cat >wt/script-from-scratch <<-\EOF &&
204 exec GIT_DIR=../.git git rev-parse --verify refs/rewritten/xyz >a || :
205 exec git rev-parse --verify refs/rewritten/xyz >b
208 test_config -C wt sequence.editor \""$PWD"/replace-editor.sh\" &&
209 git -C wt rebase -i HEAD &&
210 test_must_be_empty wt/a &&
211 test_cmp_rev HEAD "$(cat wt/b)"
214 test_expect_success
'post-rewrite hook and fixups work for merges' '
215 git checkout -b post-rewrite &&
217 git reset --hard HEAD^ &&
219 git merge -m "to fix up" same1 &&
220 echo same old same old >same2.t &&
222 git commit --fixup HEAD same2.t &&
223 fixup="$(git rev-parse HEAD)" &&
225 mkdir -p .git/hooks &&
226 test_when_finished "rm .git/hooks/post-rewrite" &&
227 echo "cat >actual" | write_script .git/hooks/post-rewrite &&
230 git rebase -i --autosquash -r HEAD^^^ &&
231 printf "%s %s\n%s %s\n%s %s\n%s %s\n" >expect $(git rev-parse \
236 test_cmp expect actual
239 test_expect_success
'refuse to merge ancestors of HEAD' '
240 echo "merge HEAD^" >script-from-scratch &&
241 test_config -C wt sequence.editor \""$PWD"/replace-editor.sh\" &&
242 before="$(git rev-parse HEAD)" &&
243 git rebase -i HEAD &&
244 test_cmp_rev HEAD $before
247 test_expect_success
'root commits' '
248 git checkout --orphan unrelated &&
249 (GIT_AUTHOR_NAME="Parsnip" GIT_AUTHOR_EMAIL="root@example.com" \
250 test_commit second-root) &&
251 test_commit third-root &&
252 cat >script-from-scratch <<-\EOF &&
257 merge first-branch # Merge the 3rd root
259 test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
261 git rebase -i --force --root -r &&
262 test "Parsnip" = "$(git show -s --format=%an HEAD^)" &&
263 test $(git rev-parse second-root^0) != $(git rev-parse HEAD^) &&
264 test $(git rev-parse second-root:second-root.t) = \
265 $(git rev-parse HEAD^:second-root.t) &&
266 test_cmp_graph HEAD <<-\EOF &&
273 : fast forward if possible &&
274 before="$(git rev-parse --verify HEAD)" &&
275 test_might_fail git config --unset sequence.editor &&
277 git rebase -i --root -r &&
278 test_cmp_rev HEAD $before
281 test_expect_success
'a "merge" into a root commit is a fast-forward' '
282 head=$(git rev-parse HEAD) &&
283 cat >script-from-scratch <<-EOF &&
287 test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
289 git rebase -i -r HEAD^ &&
290 test_cmp_rev HEAD $head
293 test_expect_success
'A root commit can be a cousin, treat it that way' '
294 git checkout --orphan khnum &&
296 git checkout -b asherah master &&
297 test_commit shamkat &&
298 git merge --allow-unrelated-histories khnum &&
300 git rebase -f -r HEAD^ &&
301 ! test_cmp_rev HEAD^2 khnum &&
302 test_cmp_graph HEAD^.. <<-\EOF &&
303 * Merge branch '\''khnum'\'' into asherah
309 git rebase --rebase-merges=rebase-cousins HEAD^ &&
310 test_cmp_graph HEAD^.. <<-\EOF
311 * Merge branch '\''khnum'\'' into asherah
319 test_expect_success
'labels that are object IDs are rewritten' '
320 git checkout -b third B &&
322 third=$(git rev-parse HEAD) &&
323 git checkout -b labels master &&
324 git merge --no-commit third &&
326 git commit -m "Merge commit '\''$third'\'' into labels" &&
327 echo noop >script-from-scratch &&
328 test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
330 git rebase -i -r A &&
331 grep "^label $third-" .git/ORIGINAL-TODO &&
332 ! grep "^label $third$" .git/ORIGINAL-TODO