3 # Copyright (c) 2007 Johannes E. Schindelin
6 test_description='git rebase interactive
8 This test runs git rebase "interactively", by faking an edit, and verifies
9 that the result still makes sense.
13 one - two - three - four (conflict-branch)
15 A - B - C - D - E (master)
21 | J - K - L - M (no-conflict-branch)
23 N - O - P (no-ff-branch)
25 where A, B, D and G all touch file1, and one, two, three, four all
26 touch file "conflict".
30 . "$TEST_DIRECTORY"/lib-rebase.sh
32 # WARNING: Modifications to the initial repository can change the SHA ID used
33 # in the expect2 file for the 'stop on conflicting pick' test.
35 test_expect_success 'setup' '
36 test_commit A file1 &&
37 test_commit B file1 &&
38 test_commit C file2 &&
39 test_commit D file1 &&
40 test_commit E file3 &&
41 git checkout -b branch1 A &&
42 test_commit F file4 &&
43 test_commit G file1 &&
44 test_commit H file5 &&
45 git checkout -b branch2 F &&
46 test_commit I file6 &&
47 git checkout -b conflict-branch A &&
48 test_commit one conflict &&
49 test_commit two conflict &&
50 test_commit three conflict &&
51 test_commit four conflict &&
52 git checkout -b no-conflict-branch A &&
53 test_commit J fileJ &&
54 test_commit K fileK &&
55 test_commit L fileL &&
56 test_commit M fileM &&
57 git checkout -b no-ff-branch A &&
58 test_commit N fileN &&
59 test_commit O fileO &&
63 # "exec" commands are run with the user shell by default, but this may
64 # be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work
65 # to create a file. Unsetting SHELL avoids such non-portable behavior
66 # in tests. It must be exported for it to take effect where needed.
70 test_expect_success 'rebase --keep-empty' '
71 git checkout -b emptybranch master &&
72 git commit --allow-empty -m "empty" &&
73 git rebase --keep-empty -i HEAD~2 &&
74 git log --oneline >actual &&
75 test_line_count = 6 actual
78 test_expect_success 'rebase -i with the exec command' '
79 git checkout master &&
82 FAKE_LINES="1 exec_>touch-one
83 2 exec_>touch-two exec_false exec_>touch-three
84 3 4 exec_>\"touch-file__name_with_spaces\";_>touch-after-semicolon 5" &&
86 test_must_fail git rebase -i A
88 test_path_is_file touch-one &&
89 test_path_is_file touch-two &&
90 test_path_is_missing touch-three " (should have stopped before)" &&
91 test_cmp_rev C HEAD &&
92 git rebase --continue &&
93 test_path_is_file touch-three &&
94 test_path_is_file "touch-file name with spaces" &&
95 test_path_is_file touch-after-semicolon &&
96 test_cmp_rev master HEAD &&
100 test_expect_success 'rebase -i with the exec command runs from tree root' '
101 git checkout master &&
102 mkdir subdir && (cd subdir &&
104 FAKE_LINES="1 exec_>touch-subdir" \
107 test_path_is_file touch-subdir &&
111 test_expect_success 'rebase -i with exec allows git commands in subdirs' '
112 test_when_finished "rm -rf subdir" &&
113 test_when_finished "git rebase --abort ||:" &&
114 git checkout master &&
115 mkdir subdir && (cd subdir &&
117 FAKE_LINES="1 exec_cd_subdir_&&_git_rev-parse_--is-inside-work-tree" \
122 test_expect_success 'rebase -i with the exec command checks tree cleanness' '
123 git checkout master &&
125 test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" git rebase -i HEAD^ &&
126 test_cmp_rev master^ HEAD &&
128 git rebase --continue
131 test_expect_success 'rebase -i with exec of inexistent command' '
132 git checkout master &&
133 test_when_finished "git rebase --abort" &&
135 test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \
136 git rebase -i HEAD^ >actual 2>&1 &&
137 ! grep "Maybe git-rebase is broken" actual
140 test_expect_success 'no changes are a nop' '
141 git checkout branch2 &&
144 test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
145 test $(git rev-parse I) = $(git rev-parse HEAD)
148 test_expect_success 'test the [branch] option' '
149 git checkout -b dead-end &&
151 git commit -m "stop here" &&
153 git rebase -i F branch2 &&
154 test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
155 test $(git rev-parse I) = $(git rev-parse branch2) &&
156 test $(git rev-parse I) = $(git rev-parse HEAD)
159 test_expect_success 'test --onto <branch>' '
160 git checkout -b test-onto branch2 &&
162 git rebase -i --onto branch1 F &&
163 test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" &&
164 test $(git rev-parse HEAD^) = $(git rev-parse branch1) &&
165 test $(git rev-parse I) = $(git rev-parse branch2)
168 test_expect_success 'rebase on top of a non-conflicting commit' '
169 git checkout branch1 &&
170 git tag original-branch1 &&
172 git rebase -i branch2 &&
173 test file6 = $(git diff --name-only original-branch1) &&
174 test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
175 test $(git rev-parse I) = $(git rev-parse branch2) &&
176 test $(git rev-parse I) = $(git rev-parse HEAD~2)
179 test_expect_success 'reflog for the branch shows state before rebase' '
180 test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
183 test_expect_success 'reflog for the branch shows correct finish message' '
184 printf "rebase -i (finish): refs/heads/branch1 onto %s\n" \
185 "$(git rev-parse branch2)" >expected &&
186 git log -g --pretty=%gs -1 refs/heads/branch1 >actual &&
187 test_cmp expected actual
190 test_expect_success 'exchange two commits' '
192 FAKE_LINES="2 1" git rebase -i HEAD~2 &&
193 test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
194 test G = $(git cat-file commit HEAD | sed -ne \$p)
198 diff --git a/file1 b/file1
199 index f70f10e..fd79235 100644
215 test_expect_success 'stop on conflicting pick' '
216 git tag new-branch1 &&
218 test_must_fail git rebase -i master &&
219 test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" &&
220 test_cmp expect .git/rebase-merge/patch &&
221 test_cmp expect2 file1 &&
222 test "$(git diff --name-status |
223 sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
224 test 4 = $(grep -v "^#" < .git/rebase-merge/done | wc -l) &&
225 test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
228 test_expect_success 'show conflicted patch' '
229 GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
230 grep "show.*REBASE_HEAD" stderr &&
231 # the original stopped-sha1 is abbreviated
232 stopped_sha1="$(git rev-parse $(cat ".git/rebase-merge/stopped-sha"))" &&
233 test "$(git rev-parse REBASE_HEAD)" = "$stopped_sha1"
236 test_expect_success 'abort' '
237 git rebase --abort &&
238 test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
239 test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
240 test_path_is_missing .git/rebase-merge
243 test_expect_success 'abort with error when new base cannot be checked out' '
244 git rm --cached file1 &&
245 git commit -m "remove file in base" &&
247 test_must_fail git rebase -i master > output 2>&1 &&
248 test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" \
250 test_i18ngrep "file1" output &&
251 test_path_is_missing .git/rebase-merge &&
252 git reset --hard HEAD^
255 test_expect_success 'retain authorship' '
259 GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
262 git rebase -i --onto master HEAD^ &&
263 git show HEAD | grep "^Author: Twerp Snog"
266 test_expect_success 'retain authorship w/ conflicts' '
267 git reset --hard twerp &&
268 test_commit a conflict a conflict-a &&
269 git reset --hard twerp &&
270 GIT_AUTHOR_NAME=AttributeMe \
271 test_commit b conflict b conflict-b &&
273 test_must_fail git rebase -i conflict-a &&
274 echo resolved >conflict &&
276 git rebase --continue &&
277 test $(git rev-parse conflict-a^0) = $(git rev-parse HEAD^) &&
282 test_expect_success 'squash' '
283 git reset --hard twerp &&
286 GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
287 echo "******************************" &&
289 FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \
290 git rebase -i --onto master HEAD~2 &&
291 test B = $(cat file7) &&
292 test $(git rev-parse HEAD^) = $(git rev-parse master)
295 test_expect_success 'retain authorship when squashing' '
296 git show HEAD | grep "^Author: Twerp Snog"
299 test_expect_success '-p handles "no changes" gracefully' '
300 HEAD=$(git rev-parse HEAD) &&
302 git rebase -i -p HEAD^ &&
303 git update-index --refresh &&
304 git diff-files --quiet &&
305 git diff-index --quiet --cached HEAD -- &&
306 test $HEAD = $(git rev-parse HEAD)
309 test_expect_failure 'exchange two commits with -p' '
312 FAKE_LINES="2 1" git rebase -i -p HEAD~2 &&
313 test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
314 test G = $(git cat-file commit HEAD | sed -ne \$p)
317 test_expect_success 'preserve merges with -p' '
318 git checkout -b to-be-preserved master^ &&
319 : > unrelated-file &&
320 git add unrelated-file &&
322 git commit -m "unrelated" &&
323 git checkout -b another-branch master &&
326 git commit -m J file1 &&
328 git merge to-be-preserved &&
331 git commit -m K file1 &&
334 git commit -m L1 file1 &&
335 git checkout HEAD^ &&
336 echo 1 > unrelated-file &&
338 git commit -m L2 unrelated-file &&
340 git merge another-branch &&
343 git commit -m M file1 &&
344 git checkout -b to-be-rebased &&
347 git rebase -i -p --onto branch1 master &&
348 git update-index --refresh &&
349 git diff-files --quiet &&
350 git diff-index --quiet --cached HEAD -- &&
351 test $(git rev-parse HEAD~6) = $(git rev-parse branch1) &&
352 test $(git rev-parse HEAD~4^2) = $(git rev-parse to-be-preserved) &&
353 test $(git rev-parse HEAD^^2^) = $(git rev-parse HEAD^^^) &&
354 test $(git show HEAD~5:file1) = B &&
355 test $(git show HEAD~3:file1) = C &&
356 test $(git show HEAD:file1) = E &&
357 test $(git show HEAD:unrelated-file) = 1
360 test_expect_success 'edit ancestor with -p' '
362 FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3 &&
363 echo 2 > unrelated-file &&
365 git commit -m L2-modified --amend unrelated-file &&
366 git rebase --continue &&
367 git update-index --refresh &&
368 git diff-files --quiet &&
369 git diff-index --quiet --cached HEAD -- &&
370 test $(git show HEAD:unrelated-file) = 2
373 test_expect_success '--continue tries to commit' '
376 test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
377 echo resolved > file1 &&
379 FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
380 test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&
381 git show HEAD | grep chouette
384 test_expect_success 'verbose flag is heeded, even after --continue' '
385 git reset --hard master@{1} &&
388 test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
389 echo resolved > file1 &&
391 git rebase --continue > output &&
392 grep "^ file1 | 2 +-$" output
395 test_expect_success C_LOCALE_OUTPUT 'multi-squash only fires up editor once' '
396 base=$(git rev-parse HEAD~4) &&
398 FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \
399 EXPECT_HEADER_COUNT=4 \
400 git rebase -i $base &&
401 test $base = $(git rev-parse HEAD^) &&
402 test 1 = $(git show | grep ONCE | wc -l)
405 test_expect_success C_LOCALE_OUTPUT 'multi-fixup does not fire up editor' '
406 git checkout -b multi-fixup E &&
407 base=$(git rev-parse HEAD~4) &&
409 FAKE_COMMIT_AMEND="NEVER" FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \
410 git rebase -i $base &&
411 test $base = $(git rev-parse HEAD^) &&
412 test 0 = $(git show | grep NEVER | wc -l) &&
413 git checkout to-be-rebased &&
414 git branch -D multi-fixup
417 test_expect_success 'commit message used after conflict' '
418 git checkout -b conflict-fixup conflict-branch &&
419 base=$(git rev-parse HEAD~4) &&
421 test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" git rebase -i $base &&
422 echo three > conflict &&
424 FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
425 git rebase --continue &&
426 test $base = $(git rev-parse HEAD^) &&
427 test 1 = $(git show | grep ONCE | wc -l) &&
428 git checkout to-be-rebased &&
429 git branch -D conflict-fixup
432 test_expect_success 'commit message retained after conflict' '
433 git checkout -b conflict-squash conflict-branch &&
434 base=$(git rev-parse HEAD~4) &&
436 test_must_fail env FAKE_LINES="1 fixup 3 squash 4" git rebase -i $base &&
437 echo three > conflict &&
439 FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
440 git rebase --continue &&
441 test $base = $(git rev-parse HEAD^) &&
442 test 2 = $(git show | grep TWICE | wc -l) &&
443 git checkout to-be-rebased &&
444 git branch -D conflict-squash
447 cat > expect-squash-fixup << EOF
455 test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messages' '
456 git checkout -b squash-fixup E &&
457 base=$(git rev-parse HEAD~4) &&
459 FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 fixup 2 squash 3 fixup 4" \
460 EXPECT_HEADER_COUNT=4 \
461 git rebase -i $base &&
462 git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup &&
463 test_cmp expect-squash-fixup actual-squash-fixup &&
464 git cat-file commit HEAD@{2} |
465 grep "^# This is a combination of 3 commits\." &&
466 git cat-file commit HEAD@{3} |
467 grep "^# This is a combination of 2 commits\." &&
468 git checkout to-be-rebased &&
469 git branch -D squash-fixup
472 test_expect_success C_LOCALE_OUTPUT 'squash ignores comments' '
473 git checkout -b skip-comments E &&
474 base=$(git rev-parse HEAD~4) &&
476 FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \
477 EXPECT_HEADER_COUNT=4 \
478 git rebase -i $base &&
479 test $base = $(git rev-parse HEAD^) &&
480 test 1 = $(git show | grep ONCE | wc -l) &&
481 git checkout to-be-rebased &&
482 git branch -D skip-comments
485 test_expect_success C_LOCALE_OUTPUT 'squash ignores blank lines' '
486 git checkout -b skip-blank-lines E &&
487 base=$(git rev-parse HEAD~4) &&
489 FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \
490 EXPECT_HEADER_COUNT=4 \
491 git rebase -i $base &&
492 test $base = $(git rev-parse HEAD^) &&
493 test 1 = $(git show | grep ONCE | wc -l) &&
494 git checkout to-be-rebased &&
495 git branch -D skip-blank-lines
498 test_expect_success 'squash works as expected' '
499 git checkout -b squash-works no-conflict-branch &&
500 one=$(git rev-parse HEAD~3) &&
502 FAKE_LINES="1 squash 3 2" EXPECT_HEADER_COUNT=2 \
503 git rebase -i HEAD~3 &&
504 test $one = $(git rev-parse HEAD~2)
507 test_expect_success 'interrupted squash works as expected' '
508 git checkout -b interrupted-squash conflict-branch &&
509 one=$(git rev-parse HEAD~3) &&
511 test_must_fail env FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
512 (echo one; echo two; echo four) > conflict &&
514 test_must_fail git rebase --continue &&
515 echo resolved > conflict &&
517 git rebase --continue &&
518 test $one = $(git rev-parse HEAD~2)
521 test_expect_success 'interrupted squash works as expected (case 2)' '
522 git checkout -b interrupted-squash2 conflict-branch &&
523 one=$(git rev-parse HEAD~3) &&
525 test_must_fail env FAKE_LINES="3 squash 1 2" git rebase -i HEAD~3 &&
526 (echo one; echo four) > conflict &&
528 test_must_fail git rebase --continue &&
529 (echo one; echo two; echo four) > conflict &&
531 test_must_fail git rebase --continue &&
532 echo resolved > conflict &&
534 git rebase --continue &&
535 test $one = $(git rev-parse HEAD~2)
538 test_expect_success '--continue tries to commit, even for "edit"' '
539 echo unrelated > file7 &&
542 git commit -m "unrelated change" &&
543 parent=$(git rev-parse HEAD^) &&
546 FAKE_LINES="edit 1" git rebase -i HEAD^ &&
547 echo edited > file7 &&
549 FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
550 test edited = $(git show HEAD:file7) &&
551 git show HEAD | grep chouette &&
552 test $parent = $(git rev-parse HEAD^)
555 test_expect_success 'aborted --continue does not squash commits after "edit"' '
556 test_when_finished "git rebase --abort" &&
557 old=$(git rev-parse HEAD) &&
560 FAKE_LINES="edit 1" git rebase -i HEAD^ &&
561 echo "edited again" > file7 &&
563 echo all the things >>conflict &&
564 test_must_fail git rebase --continue &&
565 test $old = $(git rev-parse HEAD)
568 test_expect_success 'auto-amend only edited commits after "edit"' '
571 FAKE_LINES="edit 1" git rebase -i HEAD^ &&
572 echo "edited again" > file7 &&
574 FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
575 echo "and again" > file7 &&
578 test_must_fail env FAKE_COMMIT_MESSAGE="and again" git rebase --continue &&
582 test_expect_success 'clean error after failed "exec"' '
584 test_when_finished "git rebase --abort || :" &&
586 test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^ &&
587 echo "edited again" > file7 &&
589 test_must_fail git rebase --continue 2>error &&
590 test_i18ngrep "you have staged changes in your working tree" error
593 test_expect_success 'rebase a detached HEAD' '
594 grandparent=$(git rev-parse HEAD~2) &&
595 git checkout $(git rev-parse HEAD) &&
598 FAKE_LINES="2 1" git rebase -i HEAD~2 &&
599 test $grandparent = $(git rev-parse HEAD~2)
602 test_expect_success 'rebase a commit violating pre-commit' '
604 mkdir -p .git/hooks &&
605 write_script .git/hooks/pre-commit <<-\EOF &&
606 test -z "$(git diff --cached --check)"
608 echo "monde! " >> file1 &&
610 test_must_fail git commit -m doesnt-verify file1 &&
611 git commit -m doesnt-verify --no-verify file1 &&
614 FAKE_LINES=2 git rebase -i HEAD~2
618 test_expect_success 'rebase with a file named HEAD in worktree' '
622 git checkout -b branch3 A &&
625 GIT_AUTHOR_NAME="Squashed Away" &&
626 export GIT_AUTHOR_NAME &&
629 git commit -m "Add head" &&
632 git commit -m "Add body"
636 FAKE_LINES="1 squash 2" git rebase -i to-be-rebased &&
637 test "$(git show -s --pretty=format:%an)" = "Squashed Away"
641 test_expect_success 'do "noop" when there is nothing to cherry-pick' '
643 git checkout -b branch4 HEAD &&
644 GIT_EDITOR=: git commit --amend \
645 --author="Somebody else <somebody@else.com>" &&
646 test $(git rev-parse branch3) != $(git rev-parse branch4) &&
648 git rebase -i branch3 &&
649 test $(git rev-parse branch3) = $(git rev-parse branch4)
653 test_expect_success 'submodule rebase setup' '
657 cd sub && git init && >elif &&
658 git add elif && git commit -m "submodule initial"
663 git commit -m "One" &&
666 git commit -a -m "Two" &&
668 cd sub && echo 3 >elif &&
669 git commit -a -m "submodule second"
673 git commit -a -m "Three changes submodule"
676 test_expect_success 'submodule rebase -i' '
678 FAKE_LINES="1 squash 2 3" git rebase -i A
681 test_expect_success 'submodule conflict setup' '
682 git tag submodule-base &&
683 git checkout HEAD^ &&
685 cd sub && git checkout HEAD^ && echo 4 >elif &&
686 git add elif && git commit -m "submodule conflict"
690 git commit -m "Conflict in submodule" &&
691 git tag submodule-topic
694 test_expect_success 'rebase -i continue with only submodule staged' '
696 test_must_fail git rebase -i submodule-base &&
698 git rebase --continue &&
699 test $(git rev-parse submodule-base) != $(git rev-parse HEAD)
702 test_expect_success 'rebase -i continue with unstaged submodule' '
703 git checkout submodule-topic &&
706 test_must_fail git rebase -i submodule-base &&
708 git rebase --continue &&
709 test $(git rev-parse submodule-base) = $(git rev-parse HEAD)
712 test_expect_success 'avoid unnecessary reset' '
713 git checkout master &&
715 test-tool chmtime =123456789 file3 &&
716 git update-index --refresh &&
717 HEAD=$(git rev-parse HEAD) &&
719 git rebase -i HEAD~4 &&
720 test $HEAD = $(git rev-parse HEAD) &&
721 MTIME=$(test-tool chmtime --get file3) &&
722 test 123456789 = $MTIME
725 test_expect_success 'reword' '
726 git checkout -b reword-branch master &&
728 FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" git rebase -i A &&
729 git show HEAD | grep "E changed" &&
730 test $(git rev-parse master) != $(git rev-parse HEAD) &&
731 test $(git rev-parse master^) = $(git rev-parse HEAD^) &&
732 FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" git rebase -i A &&
733 git show HEAD^ | grep "D changed" &&
734 FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" git rebase -i A &&
735 git show HEAD~3 | grep "B changed" &&
736 FAKE_LINES="1 reword 2 3 4" FAKE_COMMIT_MESSAGE="C changed" git rebase -i A &&
737 git show HEAD~2 | grep "C changed"
740 test_expect_success 'rebase -i can copy notes' '
741 git config notes.rewrite.rebase true &&
742 git config notes.rewriteRef "refs/notes/*" &&
746 git notes add -m"a note" n3 &&
748 git rebase -i --onto n1 n2 &&
749 test "a note" = "$(git notes show HEAD)"
758 test_expect_success 'rebase -i can copy notes over a fixup' '
759 git reset --hard n3 &&
760 git notes add -m"an earlier note" n2 &&
762 GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 fixup 2" git rebase -i n1 &&
763 git notes show > output &&
764 test_cmp expect output
767 test_expect_success 'rebase while detaching HEAD' '
768 git symbolic-ref HEAD &&
769 grandparent=$(git rev-parse HEAD~2) &&
772 FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0 &&
773 test $grandparent = $(git rev-parse HEAD~2) &&
774 test_must_fail git symbolic-ref HEAD
777 test_tick # Ensure that the rebased commits get a different timestamp.
778 test_expect_success 'always cherry-pick with --no-ff' '
779 git checkout no-ff-branch &&
780 git tag original-no-ff-branch &&
782 git rebase -i --no-ff A &&
786 test ! $(git rev-parse HEAD~$p) = $(git rev-parse original-no-ff-branch~$p) &&
787 git diff HEAD~$p original-no-ff-branch~$p > out &&
790 test $(git rev-parse HEAD~3) = $(git rev-parse original-no-ff-branch~3) &&
791 git diff HEAD~3 original-no-ff-branch~3 > out &&
795 test_expect_success 'set up commits with funny messages' '
796 git checkout -b funny A &&
799 git commit -a -m "end with slash\\" &&
802 git commit -a -m "something (\000) that looks like octal" &&
805 git commit -a -m "something (\n) that looks like a newline" &&
808 git commit -a -m "another commit"
811 test_expect_success 'rebase-i history with funny messages' '
812 git rev-list A..funny >expect &&
815 FAKE_LINES="1 2 3 4" git rebase -i A &&
816 git rev-list A.. >actual &&
817 test_cmp expect actual
820 test_expect_success 'prepare for rebase -i --exec' '
821 git checkout master &&
822 git checkout -b execute &&
823 test_commit one_exec main.txt one_exec &&
824 test_commit two_exec main.txt two_exec &&
825 test_commit three_exec main.txt three_exec
828 test_expect_success 'running "git rebase -i --exec git show HEAD"' '
830 git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
832 FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
834 git rebase -i HEAD~2 >expect
836 sed -e "1,9d" expect >expected &&
837 test_cmp expected actual
840 test_expect_success 'running "git rebase --exec git show HEAD -i"' '
841 git reset --hard execute &&
843 git rebase --exec "git show HEAD" -i HEAD~2 >actual &&
845 FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
847 git rebase -i HEAD~2 >expect
849 sed -e "1,9d" expect >expected &&
850 test_cmp expected actual
853 test_expect_success 'running "git rebase -ix git show HEAD"' '
854 git reset --hard execute &&
856 git rebase -ix "git show HEAD" HEAD~2 >actual &&
858 FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
860 git rebase -i HEAD~2 >expect
862 sed -e "1,9d" expect >expected &&
863 test_cmp expected actual
867 test_expect_success 'rebase -ix with several <CMD>' '
868 git reset --hard execute &&
870 git rebase -ix "git show HEAD; pwd" HEAD~2 >actual &&
872 FAKE_LINES="1 exec_git_show_HEAD;_pwd 2 exec_git_show_HEAD;_pwd" &&
874 git rebase -i HEAD~2 >expect
876 sed -e "1,9d" expect >expected &&
877 test_cmp expected actual
880 test_expect_success 'rebase -ix with several instances of --exec' '
881 git reset --hard execute &&
883 git rebase -i --exec "git show HEAD" --exec "pwd" HEAD~2 >actual &&
885 FAKE_LINES="1 exec_git_show_HEAD exec_pwd 2
886 exec_git_show_HEAD exec_pwd" &&
888 git rebase -i HEAD~2 >expect
890 sed -e "1,11d" expect >expected &&
891 test_cmp expected actual
894 test_expect_success C_LOCALE_OUTPUT 'rebase -ix with --autosquash' '
895 git reset --hard execute &&
896 git checkout -b autosquash &&
897 echo second >second.txt &&
898 git add second.txt &&
899 git commit -m "fixup! two_exec" &&
902 git commit -m "fixup! two_exec" &&
905 git checkout -b autosquash_actual &&
906 git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual
908 git checkout autosquash &&
910 git checkout -b autosquash_expected &&
911 FAKE_LINES="1 fixup 3 fixup 4 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
913 git rebase -i HEAD~4 >expect
915 sed -e "1,13d" expect >expected &&
916 test_cmp expected actual
919 test_expect_success 'rebase --exec works without -i ' '
920 git reset --hard execute &&
921 rm -rf exec_output &&
922 EDITOR="echo >invoked_editor" git rebase --exec "echo a line >>exec_output" HEAD~2 2>actual &&
923 test_i18ngrep "Successfully rebased and updated" actual &&
924 test_line_count = 2 exec_output &&
925 test_path_is_missing invoked_editor
928 test_expect_success 'rebase -i --exec without <CMD>' '
929 git reset --hard execute &&
931 test_must_fail git rebase -i --exec 2>actual &&
932 test_i18ngrep "requires a value" actual &&
936 test_expect_success 'rebase -i --root re-order and drop commits' '
939 FAKE_LINES="3 1 2 5" git rebase -i --root &&
940 test E = $(git cat-file commit HEAD | sed -ne \$p) &&
941 test B = $(git cat-file commit HEAD^ | sed -ne \$p) &&
942 test A = $(git cat-file commit HEAD^^ | sed -ne \$p) &&
943 test C = $(git cat-file commit HEAD^^^ | sed -ne \$p) &&
944 test 0 = $(git cat-file commit HEAD^^^ | grep -c ^parent\ )
947 test_expect_success 'rebase -i --root retain root commit author and message' '
951 GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
953 FAKE_LINES="2" git rebase -i --root &&
954 git cat-file commit HEAD | grep -q "^author Twerp Snog" &&
955 git cat-file commit HEAD | grep -q "^different author$"
958 test_expect_success 'rebase -i --root temporary sentinel commit' '
961 test_must_fail env FAKE_LINES="2" git rebase -i --root &&
962 git cat-file commit HEAD | grep "^tree 4b825dc642cb" &&
966 test_expect_success 'rebase -i --root fixup root commit' '
969 FAKE_LINES="1 fixup 2" git rebase -i --root &&
970 test A = $(git cat-file commit HEAD | sed -ne \$p) &&
971 test B = $(git show HEAD:file1) &&
972 test 0 = $(git cat-file commit HEAD | grep -c ^parent\ )
975 test_expect_success 'rebase -i --root reword root commit' '
976 test_when_finished "test_might_fail git rebase --abort" &&
977 git checkout -b reword-root-branch master &&
979 FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \
980 git rebase -i --root &&
981 git show HEAD^ | grep "A changed" &&
982 test -z "$(git show -s --format=%p HEAD^)"
985 test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-interactive rebase' '
987 git checkout conflict-branch &&
989 test_must_fail git rebase --onto HEAD~2 HEAD~ &&
990 test_must_fail git rebase --edit-todo &&
994 test_expect_success 'rebase --edit-todo can be used to modify todo' '
996 git checkout no-conflict-branch^0 &&
998 FAKE_LINES="edit 1 2 3" git rebase -i HEAD~3 &&
999 FAKE_LINES="2 1" git rebase --edit-todo &&
1000 git rebase --continue &&
1001 test M = $(git cat-file commit HEAD^ | sed -ne \$p) &&
1002 test L = $(git cat-file commit HEAD | sed -ne \$p)
1005 test_expect_success 'rebase -i produces readable reflog' '
1007 git branch -f branch-reflog-test H &&
1009 git rebase -i --onto I F branch-reflog-test &&
1010 cat >expect <<-\EOF &&
1011 rebase -i (finish): returning to refs/heads/branch-reflog-test
1014 rebase -i (start): checkout I
1016 git reflog -n4 HEAD |
1017 sed "s/[^:]*: //" >actual &&
1018 test_cmp expect actual
1021 test_expect_success 'rebase -i respects core.commentchar' '
1024 test_config core.commentchar "\\" &&
1025 write_script remove-all-but-first.sh <<-\EOF &&
1026 sed -e "2,\$s/^/\\\\/" "$1" >"$1.tmp" &&
1029 test_set_editor "$(pwd)/remove-all-but-first.sh" &&
1031 test B = $(git cat-file commit HEAD^ | sed -ne \$p)
1034 test_expect_success 'rebase -i respects core.commentchar=auto' '
1035 test_config core.commentchar auto &&
1036 write_script copy-edit-script.sh <<-\EOF &&
1039 test_set_editor "$(pwd)/copy-edit-script.sh" &&
1040 test_when_finished "git rebase --abort || :" &&
1041 git rebase -i HEAD^ &&
1042 test -z "$(grep -ve "^#" -e "^\$" -e "^pick" edit-script)"
1045 test_expect_success 'rebase -i, with <onto> and <upstream> specified as :/quuxery' '
1046 test_when_finished "git branch -D torebase" &&
1047 git checkout -b torebase branch1 &&
1048 upstream=$(git rev-parse ":/J") &&
1049 onto=$(git rev-parse ":/A") &&
1050 git rebase --onto $onto $upstream &&
1051 git reset --hard branch1 &&
1052 git rebase --onto ":/A" ":/J" &&
1053 git checkout branch1
1056 test_expect_success 'rebase -i with --strategy and -X' '
1057 git checkout -b conflict-merge-use-theirs conflict-branch &&
1058 git reset --hard HEAD^ &&
1059 echo five >conflict &&
1061 git commit -a -m "one file conflict" &&
1062 EDITOR=true git rebase -i --strategy=recursive -Xours conflict-branch &&
1063 test $(git show conflict-branch:conflict) = $(cat conflict) &&
1064 test $(cat file1) = Z
1067 test_expect_success 'interrupted rebase -i with --strategy and -X' '
1068 git checkout -b conflict-merge-use-theirs-interrupted conflict-branch &&
1069 git reset --hard HEAD^ &&
1071 git add breakpoint &&
1072 git commit -m "breakpoint for interactive mode" &&
1073 echo five >conflict &&
1075 git commit -a -m "one file conflict" &&
1077 FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive -Xours conflict-branch &&
1078 git rebase --continue &&
1079 test $(git show conflict-branch:conflict) = $(cat conflict) &&
1080 test $(cat file1) = Z
1083 test_expect_success 'rebase -i error on commits with \ in message' '
1084 current_head=$(git rev-parse HEAD) &&
1085 test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" &&
1086 test_commit TO-REMOVE will-conflict old-content &&
1087 test_commit "\temp" will-conflict new-content dummy &&
1088 test_must_fail env EDITOR=true git rebase -i HEAD^ --onto HEAD^^ 2>error &&
1089 test_expect_code 1 grep " emp" error
1092 test_expect_success 'short SHA-1 setup' '
1093 test_when_finished "git checkout master" &&
1094 git checkout --orphan collide &&
1098 test_commit collide1 collide &&
1099 test_commit --notick collide2 collide &&
1100 test_commit --notick collide3 collide
1104 test_expect_success 'short SHA-1 collide' '
1105 test_when_finished "reset_rebase && git checkout master" &&
1106 git checkout collide &&
1111 FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \
1112 FAKE_LINES="reword 1 2" git rebase -i HEAD~2
1116 test_expect_success 'respect core.abbrev' '
1117 git config core.abbrev 12 &&
1118 set_cat_todo_editor &&
1119 test_must_fail git rebase -i HEAD~4 >todo-list &&
1120 test 4 = $(grep -c "pick [0-9a-f]\{12,\}" todo-list)
1123 test_expect_success 'todo count' '
1124 write_script dump-raw.sh <<-\EOF &&
1127 test_set_editor "$(pwd)/dump-raw.sh" &&
1128 git rebase -i HEAD~4 >actual &&
1129 test_i18ngrep "^# Rebase ..* onto ..* ([0-9]" actual
1132 test_expect_success 'rebase -i commits that overwrite untracked files (pick)' '
1133 git checkout --force branch2 &&
1136 FAKE_LINES="edit 1 2" git rebase -i A &&
1137 test_cmp_rev HEAD F &&
1138 test_path_is_missing file6 &&
1140 test_must_fail git rebase --continue &&
1141 test_cmp_rev HEAD F &&
1143 git rebase --continue &&
1147 test_expect_success 'rebase -i commits that overwrite untracked files (squash)' '
1148 git checkout --force branch2 &&
1150 git tag original-branch2 &&
1152 FAKE_LINES="edit 1 squash 2" git rebase -i A &&
1153 test_cmp_rev HEAD F &&
1154 test_path_is_missing file6 &&
1156 test_must_fail git rebase --continue &&
1157 test_cmp_rev HEAD F &&
1159 git rebase --continue &&
1160 test $(git cat-file commit HEAD | sed -ne \$p) = I &&
1161 git reset --hard original-branch2
1164 test_expect_success 'rebase -i commits that overwrite untracked files (no ff)' '
1165 git checkout --force branch2 &&
1168 FAKE_LINES="edit 1 2" git rebase -i --no-ff A &&
1169 test $(git cat-file commit HEAD | sed -ne \$p) = F &&
1170 test_path_is_missing file6 &&
1172 test_must_fail git rebase --continue &&
1173 test $(git cat-file commit HEAD | sed -ne \$p) = F &&
1175 git rebase --continue &&
1176 test $(git cat-file commit HEAD | sed -ne \$p) = I
1179 test_expect_success 'rebase --continue removes CHERRY_PICK_HEAD' '
1180 git checkout -b commit-to-skip &&
1183 test_seq 5 | sed "s/$double/&&/" >seq &&
1186 git commit -m seq-$double
1189 git reset --hard HEAD~2 &&
1190 git cherry-pick seq-onto &&
1192 test_must_fail env FAKE_LINES= git rebase -i seq-onto &&
1193 test -d .git/rebase-merge &&
1194 git rebase --continue &&
1195 git diff --exit-code seq-onto &&
1196 test ! -d .git/rebase-merge &&
1197 test ! -f .git/CHERRY_PICK_HEAD
1200 rebase_setup_and_clean () {
1201 test_when_finished "
1202 git checkout master &&
1203 test_might_fail git branch -D $1 &&
1204 test_might_fail git rebase --abort
1206 git checkout -b $1 master
1209 test_expect_success 'drop' '
1210 rebase_setup_and_clean drop-test &&
1212 FAKE_LINES="1 drop 2 3 drop 4 5" git rebase -i --root &&
1213 test E = $(git cat-file commit HEAD | sed -ne \$p) &&
1214 test C = $(git cat-file commit HEAD^ | sed -ne \$p) &&
1215 test A = $(git cat-file commit HEAD^^ | sed -ne \$p)
1218 test_expect_success 'rebase -i respects rebase.missingCommitsCheck = ignore' '
1219 test_config rebase.missingCommitsCheck ignore &&
1220 rebase_setup_and_clean missing-commit &&
1222 FAKE_LINES="1 2 3 4" \
1223 git rebase -i --root 2>actual &&
1224 test D = $(git cat-file commit HEAD | sed -ne \$p) &&
1226 "Successfully rebased and updated refs/heads/missing-commit" \
1231 Warning: some commits may have been dropped accidentally.
1232 Dropped commits (newer to older):
1233 - $(git rev-list --pretty=oneline --abbrev-commit -1 master)
1234 To avoid this message, use "drop" to explicitly remove a commit.
1236 Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
1237 The possible behaviours are: ignore, warn, error.
1243 Successfully rebased and updated refs/heads/missing-commit.
1250 test_expect_success 'rebase -i respects rebase.missingCommitsCheck = warn' '
1251 test_config rebase.missingCommitsCheck warn &&
1252 rebase_setup_and_clean missing-commit &&
1254 FAKE_LINES="1 2 3 4" \
1255 git rebase -i --root 2>actual.2 &&
1256 cr_to_nl <actual.2 >actual &&
1257 test_i18ncmp expect actual &&
1258 test D = $(git cat-file commit HEAD | sed -ne \$p)
1262 Warning: some commits may have been dropped accidentally.
1263 Dropped commits (newer to older):
1264 - $(git rev-list --pretty=oneline --abbrev-commit -1 master)
1265 - $(git rev-list --pretty=oneline --abbrev-commit -1 master~2)
1266 To avoid this message, use "drop" to explicitly remove a commit.
1268 Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
1269 The possible behaviours are: ignore, warn, error.
1271 You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
1272 Or you can abort the rebase with 'git rebase --abort'.
1275 test_expect_success 'rebase -i respects rebase.missingCommitsCheck = error' '
1276 test_config rebase.missingCommitsCheck error &&
1277 rebase_setup_and_clean missing-commit &&
1279 test_must_fail env FAKE_LINES="1 2 4" \
1280 git rebase -i --root 2>actual &&
1281 test_i18ncmp expect actual &&
1282 cp .git/rebase-merge/git-rebase-todo.backup \
1283 .git/rebase-merge/git-rebase-todo &&
1284 FAKE_LINES="1 2 drop 3 4 drop 5" \
1285 git rebase --edit-todo &&
1286 git rebase --continue &&
1287 test D = $(git cat-file commit HEAD | sed -ne \$p) &&
1288 test B = $(git cat-file commit HEAD^ | sed -ne \$p)
1291 test_expect_success 'respects rebase.abbreviateCommands with fixup, squash and exec' '
1292 rebase_setup_and_clean abbrevcmd &&
1293 test_commit "first" file1.txt "first line" first &&
1294 test_commit "second" file1.txt "another line" second &&
1295 test_commit "fixup! first" file2.txt "first line again" first_fixup &&
1296 test_commit "squash! second" file1.txt "another line here" second_squash &&
1297 cat >expected <<-EOF &&
1298 p $(git rev-list --abbrev-commit -1 first) first
1299 f $(git rev-list --abbrev-commit -1 first_fixup) fixup! first
1301 p $(git rev-list --abbrev-commit -1 second) second
1302 s $(git rev-list --abbrev-commit -1 second_squash) squash! second
1305 git checkout abbrevcmd &&
1306 set_cat_todo_editor &&
1307 test_config rebase.abbreviateCommands true &&
1308 test_must_fail git rebase -i --exec "git show HEAD" \
1309 --autosquash master >actual &&
1310 test_cmp expected actual
1313 test_expect_success 'static check of bad command' '
1314 rebase_setup_and_clean bad-cmd &&
1316 test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \
1317 git rebase -i --root 2>actual &&
1318 test_i18ngrep "badcmd $(git rev-list --oneline -1 master~1)" actual &&
1319 test_i18ngrep "You can fix this with .git rebase --edit-todo.." actual &&
1320 FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo &&
1321 git rebase --continue &&
1322 test E = $(git cat-file commit HEAD | sed -ne \$p) &&
1323 test C = $(git cat-file commit HEAD^ | sed -ne \$p)
1326 test_expect_success 'tabs and spaces are accepted in the todolist' '
1327 rebase_setup_and_clean indented-comment &&
1328 write_script add-indent.sh <<-\EOF &&
1330 # Turn single spaces into space/tab mix
1331 sed "1s/ / /g; 2s/ / /g; 3s/ / /g" "$1"
1332 printf "\n\t# comment\n #more\n\t # comment\n"
1336 test_set_editor "$(pwd)/add-indent.sh" &&
1337 git rebase -i HEAD^^^ &&
1338 test E = $(git cat-file commit HEAD | sed -ne \$p)
1341 test_expect_success 'static check of bad SHA-1' '
1342 rebase_setup_and_clean bad-sha &&
1344 test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \
1345 git rebase -i --root 2>actual &&
1346 test_i18ngrep "edit XXXXXXX False commit" actual &&
1347 test_i18ngrep "You can fix this with .git rebase --edit-todo.." actual &&
1348 FAKE_LINES="1 2 4 5 6" git rebase --edit-todo &&
1349 git rebase --continue &&
1350 test E = $(git cat-file commit HEAD | sed -ne \$p)
1353 test_expect_success 'editor saves as CR/LF' '
1354 git checkout -b with-crlf &&
1355 write_script add-crs.sh <<-\EOF &&
1356 sed -e "s/\$/Q/" <"$1" | tr Q "\\015" >"$1".new &&
1360 test_set_editor "$(pwd)/add-crs.sh" &&
1366 test_expect_success 'rebase -i --gpg-sign=<key-id>' '
1367 test_when_finished "test_might_fail git rebase --abort" &&
1369 FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \
1371 test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err
1374 test_expect_success 'rebase -i --gpg-sign=<key-id> overrides commit.gpgSign' '
1375 test_when_finished "test_might_fail git rebase --abort" &&
1376 test_config commit.gpgsign true &&
1378 FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \
1380 test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err