t/t3404-rebase-interactive.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2007 Johannes E. Schindelin
   4 #
   5
   6 test_description='git rebase interactive
   7
   8 This test runs git rebase "interactively", by faking an edit, and verifies
   9 that the result still makes sense.
  10
  11 Initial setup:
  12
  13      one - two - three - four (conflict-branch)
  14    /
  15  A - B - C - D - E            (master)
  16  | \
  17  |   F - G - H                (branch1)
  18  |     \
  19  |\      I                    (branch2)
  20  | \
  21  |   J - K - L - M            (no-conflict-branch)
  22   \
  23     N - O - P                 (no-ff-branch)
  24
  25  where A, B, D and G all touch file1, and one, two, three, four all
  26  touch file "conflict".
  27 '
  28 . ./test-lib.sh
  29
  30 . "$TEST_DIRECTORY"/lib-rebase.sh
  31
  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.
  34
  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 &&
  60         test_commit P fileP
  61 '
  62
  63 # "exec" commands are ran 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. Unseting SHELL avoids such non-portable behavior
  66 # in tests. It must be exported for it to take effect where needed.
  67 SHELL=
  68 export SHELL
  69
  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
  76 '
  77
  78 test_expect_success 'rebase -i with the exec command' '
  79         git checkout master &&
  80         (
  81         set_fake_editor &&
  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" &&
  85         export FAKE_LINES &&
  86         test_must_fail git rebase -i A
  87         ) &&
  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 &&
  97         rm -f touch-*
  98 '
  99
 100 test_expect_success 'rebase -i with the exec command runs from tree root' '
 101         git checkout master &&
 102         mkdir subdir && (cd subdir &&
 103         set_fake_editor &&
 104         FAKE_LINES="1 exec_>touch-subdir" \
 105                 git rebase -i HEAD^
 106         ) &&
 107         test_path_is_file touch-subdir &&
 108         rm -fr subdir
 109 '
 110
 111 test_expect_success 'rebase -i with the exec command checks tree cleanness' '
 112         git checkout master &&
 113         set_fake_editor &&
 114         test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" git rebase -i HEAD^ &&
 115         test_cmp_rev master^ HEAD &&
 116         git reset --hard &&
 117         git rebase --continue
 118 '
 119
 120 test_expect_success 'rebase -i with exec of inexistent command' '
 121         git checkout master &&
 122         test_when_finished "git rebase --abort" &&
 123         set_fake_editor &&
 124         test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \
 125         git rebase -i HEAD^ >actual 2>&1 &&
 126         ! grep "Maybe git-rebase is broken" actual
 127 '
 128
 129 test_expect_success 'no changes are a nop' '
 130         git checkout branch2 &&
 131         set_fake_editor &&
 132         git rebase -i F &&
 133         test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
 134         test $(git rev-parse I) = $(git rev-parse HEAD)
 135 '
 136
 137 test_expect_success 'test the [branch] option' '
 138         git checkout -b dead-end &&
 139         git rm file6 &&
 140         git commit -m "stop here" &&
 141         set_fake_editor &&
 142         git rebase -i F branch2 &&
 143         test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
 144         test $(git rev-parse I) = $(git rev-parse branch2) &&
 145         test $(git rev-parse I) = $(git rev-parse HEAD)
 146 '
 147
 148 test_expect_success 'test --onto <branch>' '
 149         git checkout -b test-onto branch2 &&
 150         set_fake_editor &&
 151         git rebase -i --onto branch1 F &&
 152         test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" &&
 153         test $(git rev-parse HEAD^) = $(git rev-parse branch1) &&
 154         test $(git rev-parse I) = $(git rev-parse branch2)
 155 '
 156
 157 test_expect_success 'rebase on top of a non-conflicting commit' '
 158         git checkout branch1 &&
 159         git tag original-branch1 &&
 160         set_fake_editor &&
 161         git rebase -i branch2 &&
 162         test file6 = $(git diff --name-only original-branch1) &&
 163         test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
 164         test $(git rev-parse I) = $(git rev-parse branch2) &&
 165         test $(git rev-parse I) = $(git rev-parse HEAD~2)
 166 '
 167
 168 test_expect_success 'reflog for the branch shows state before rebase' '
 169         test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
 170 '
 171
 172 test_expect_success 'exchange two commits' '
 173         set_fake_editor &&
 174         FAKE_LINES="2 1" git rebase -i HEAD~2 &&
 175         test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
 176         test G = $(git cat-file commit HEAD | sed -ne \$p)
 177 '
 178
 179 cat > expect << EOF
 180 diff --git a/file1 b/file1
 181 index f70f10e..fd79235 100644
 182 --- a/file1
 183 +++ b/file1
 184 @@ -1 +1 @@
 185 -A
 186 +G
 187 EOF
 188
 189 cat > expect2 << EOF
 190 <<<<<<< HEAD
 191 D
 192 =======
 193 G
 194 >>>>>>> 5d18e54... G
 195 EOF
 196
 197 test_expect_success 'stop on conflicting pick' '
 198         git tag new-branch1 &&
 199         set_fake_editor &&
 200         test_must_fail git rebase -i master &&
 201         test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" &&
 202         test_cmp expect .git/rebase-merge/patch &&
 203         test_cmp expect2 file1 &&
 204         test "$(git diff --name-status |
 205                 sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
 206         test 4 = $(grep -v "^#" < .git/rebase-merge/done | wc -l) &&
 207         test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
 208 '
 209
 210 test_expect_success 'abort' '
 211         git rebase --abort &&
 212         test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
 213         test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
 214         test_path_is_missing .git/rebase-merge
 215 '
 216
 217 test_expect_success 'abort with error when new base cannot be checked out' '
 218         git rm --cached file1 &&
 219         git commit -m "remove file in base" &&
 220         set_fake_editor &&
 221         test_must_fail git rebase -i master > output 2>&1 &&
 222         grep "The following untracked working tree files would be overwritten by checkout:" \
 223                 output &&
 224         grep "file1" output &&
 225         test_path_is_missing .git/rebase-merge &&
 226         git reset --hard HEAD^
 227 '
 228
 229 test_expect_success 'retain authorship' '
 230         echo A > file7 &&
 231         git add file7 &&
 232         test_tick &&
 233         GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
 234         git tag twerp &&
 235         set_fake_editor &&
 236         git rebase -i --onto master HEAD^ &&
 237         git show HEAD | grep "^Author: Twerp Snog"
 238 '
 239
 240 test_expect_success 'squash' '
 241         git reset --hard twerp &&
 242         echo B > file7 &&
 243         test_tick &&
 244         GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
 245         echo "******************************" &&
 246         set_fake_editor &&
 247         FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \
 248                 git rebase -i --onto master HEAD~2 &&
 249         test B = $(cat file7) &&
 250         test $(git rev-parse HEAD^) = $(git rev-parse master)
 251 '
 252
 253 test_expect_success 'retain authorship when squashing' '
 254         git show HEAD | grep "^Author: Twerp Snog"
 255 '
 256
 257 test_expect_success '-p handles "no changes" gracefully' '
 258         HEAD=$(git rev-parse HEAD) &&
 259         set_fake_editor &&
 260         git rebase -i -p HEAD^ &&
 261         git update-index --refresh &&
 262         git diff-files --quiet &&
 263         git diff-index --quiet --cached HEAD -- &&
 264         test $HEAD = $(git rev-parse HEAD)
 265 '
 266
 267 test_expect_failure 'exchange two commits with -p' '
 268         git checkout H &&
 269         set_fake_editor &&
 270         FAKE_LINES="2 1" git rebase -i -p HEAD~2 &&
 271         test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
 272         test G = $(git cat-file commit HEAD | sed -ne \$p)
 273 '
 274
 275 test_expect_success 'preserve merges with -p' '
 276         git checkout -b to-be-preserved master^ &&
 277         : > unrelated-file &&
 278         git add unrelated-file &&
 279         test_tick &&
 280         git commit -m "unrelated" &&
 281         git checkout -b another-branch master &&
 282         echo B > file1 &&
 283         test_tick &&
 284         git commit -m J file1 &&
 285         test_tick &&
 286         git merge to-be-preserved &&
 287         echo C > file1 &&
 288         test_tick &&
 289         git commit -m K file1 &&
 290         echo D > file1 &&
 291         test_tick &&
 292         git commit -m L1 file1 &&
 293         git checkout HEAD^ &&
 294         echo 1 > unrelated-file &&
 295         test_tick &&
 296         git commit -m L2 unrelated-file &&
 297         test_tick &&
 298         git merge another-branch &&
 299         echo E > file1 &&
 300         test_tick &&
 301         git commit -m M file1 &&
 302         git checkout -b to-be-rebased &&
 303         test_tick &&
 304         set_fake_editor &&
 305         git rebase -i -p --onto branch1 master &&
 306         git update-index --refresh &&
 307         git diff-files --quiet &&
 308         git diff-index --quiet --cached HEAD -- &&
 309         test $(git rev-parse HEAD~6) = $(git rev-parse branch1) &&
 310         test $(git rev-parse HEAD~4^2) = $(git rev-parse to-be-preserved) &&
 311         test $(git rev-parse HEAD^^2^) = $(git rev-parse HEAD^^^) &&
 312         test $(git show HEAD~5:file1) = B &&
 313         test $(git show HEAD~3:file1) = C &&
 314         test $(git show HEAD:file1) = E &&
 315         test $(git show HEAD:unrelated-file) = 1
 316 '
 317
 318 test_expect_success 'edit ancestor with -p' '
 319         set_fake_editor &&
 320         FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3 &&
 321         echo 2 > unrelated-file &&
 322         test_tick &&
 323         git commit -m L2-modified --amend unrelated-file &&
 324         git rebase --continue &&
 325         git update-index --refresh &&
 326         git diff-files --quiet &&
 327         git diff-index --quiet --cached HEAD -- &&
 328         test $(git show HEAD:unrelated-file) = 2
 329 '
 330
 331 test_expect_success '--continue tries to commit' '
 332         test_tick &&
 333         set_fake_editor &&
 334         test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
 335         echo resolved > file1 &&
 336         git add file1 &&
 337         FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
 338         test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&
 339         git show HEAD | grep chouette
 340 '
 341
 342 test_expect_success 'verbose flag is heeded, even after --continue' '
 343         git reset --hard master@{1} &&
 344         test_tick &&
 345         set_fake_editor &&
 346         test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
 347         echo resolved > file1 &&
 348         git add file1 &&
 349         git rebase --continue > output &&
 350         grep "^ file1 | 2 +-$" output
 351 '
 352
 353 test_expect_success 'multi-squash only fires up editor once' '
 354         base=$(git rev-parse HEAD~4) &&
 355         set_fake_editor &&
 356         FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \
 357                 EXPECT_HEADER_COUNT=4 \
 358                 git rebase -i $base &&
 359         test $base = $(git rev-parse HEAD^) &&
 360         test 1 = $(git show | grep ONCE | wc -l)
 361 '
 362
 363 test_expect_success 'multi-fixup does not fire up editor' '
 364         git checkout -b multi-fixup E &&
 365         base=$(git rev-parse HEAD~4) &&
 366         set_fake_editor &&
 367         FAKE_COMMIT_AMEND="NEVER" FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \
 368                 git rebase -i $base &&
 369         test $base = $(git rev-parse HEAD^) &&
 370         test 0 = $(git show | grep NEVER | wc -l) &&
 371         git checkout to-be-rebased &&
 372         git branch -D multi-fixup
 373 '
 374
 375 test_expect_success 'commit message used after conflict' '
 376         git checkout -b conflict-fixup conflict-branch &&
 377         base=$(git rev-parse HEAD~4) &&
 378         set_fake_editor &&
 379         test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" git rebase -i $base &&
 380         echo three > conflict &&
 381         git add conflict &&
 382         FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
 383                 git rebase --continue &&
 384         test $base = $(git rev-parse HEAD^) &&
 385         test 1 = $(git show | grep ONCE | wc -l) &&
 386         git checkout to-be-rebased &&
 387         git branch -D conflict-fixup
 388 '
 389
 390 test_expect_success 'commit message retained after conflict' '
 391         git checkout -b conflict-squash conflict-branch &&
 392         base=$(git rev-parse HEAD~4) &&
 393         set_fake_editor &&
 394         test_must_fail env FAKE_LINES="1 fixup 3 squash 4" git rebase -i $base &&
 395         echo three > conflict &&
 396         git add conflict &&
 397         FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
 398                 git rebase --continue &&
 399         test $base = $(git rev-parse HEAD^) &&
 400         test 2 = $(git show | grep TWICE | wc -l) &&
 401         git checkout to-be-rebased &&
 402         git branch -D conflict-squash
 403 '
 404
 405 cat > expect-squash-fixup << EOF
 406 B
 407
 408 D
 409
 410 ONCE
 411 EOF
 412
 413 test_expect_success 'squash and fixup generate correct log messages' '
 414         git checkout -b squash-fixup E &&
 415         base=$(git rev-parse HEAD~4) &&
 416         set_fake_editor &&
 417         FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 fixup 2 squash 3 fixup 4" \
 418                 EXPECT_HEADER_COUNT=4 \
 419                 git rebase -i $base &&
 420         git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup &&
 421         test_cmp expect-squash-fixup actual-squash-fixup &&
 422         git checkout to-be-rebased &&
 423         git branch -D squash-fixup
 424 '
 425
 426 test_expect_success 'squash ignores comments' '
 427         git checkout -b skip-comments E &&
 428         base=$(git rev-parse HEAD~4) &&
 429         set_fake_editor &&
 430         FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \
 431                 EXPECT_HEADER_COUNT=4 \
 432                 git rebase -i $base &&
 433         test $base = $(git rev-parse HEAD^) &&
 434         test 1 = $(git show | grep ONCE | wc -l) &&
 435         git checkout to-be-rebased &&
 436         git branch -D skip-comments
 437 '
 438
 439 test_expect_success 'squash ignores blank lines' '
 440         git checkout -b skip-blank-lines E &&
 441         base=$(git rev-parse HEAD~4) &&
 442         set_fake_editor &&
 443         FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \
 444                 EXPECT_HEADER_COUNT=4 \
 445                 git rebase -i $base &&
 446         test $base = $(git rev-parse HEAD^) &&
 447         test 1 = $(git show | grep ONCE | wc -l) &&
 448         git checkout to-be-rebased &&
 449         git branch -D skip-blank-lines
 450 '
 451
 452 test_expect_success 'squash works as expected' '
 453         git checkout -b squash-works no-conflict-branch &&
 454         one=$(git rev-parse HEAD~3) &&
 455         set_fake_editor &&
 456         FAKE_LINES="1 squash 3 2" EXPECT_HEADER_COUNT=2 \
 457                 git rebase -i HEAD~3 &&
 458         test $one = $(git rev-parse HEAD~2)
 459 '
 460
 461 test_expect_success 'interrupted squash works as expected' '
 462         git checkout -b interrupted-squash conflict-branch &&
 463         one=$(git rev-parse HEAD~3) &&
 464         set_fake_editor &&
 465         test_must_fail env FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
 466         (echo one; echo two; echo four) > conflict &&
 467         git add conflict &&
 468         test_must_fail git rebase --continue &&
 469         echo resolved > conflict &&
 470         git add conflict &&
 471         git rebase --continue &&
 472         test $one = $(git rev-parse HEAD~2)
 473 '
 474
 475 test_expect_success 'interrupted squash works as expected (case 2)' '
 476         git checkout -b interrupted-squash2 conflict-branch &&
 477         one=$(git rev-parse HEAD~3) &&
 478         set_fake_editor &&
 479         test_must_fail env FAKE_LINES="3 squash 1 2" git rebase -i HEAD~3 &&
 480         (echo one; echo four) > conflict &&
 481         git add conflict &&
 482         test_must_fail git rebase --continue &&
 483         (echo one; echo two; echo four) > conflict &&
 484         git add conflict &&
 485         test_must_fail git rebase --continue &&
 486         echo resolved > conflict &&
 487         git add conflict &&
 488         git rebase --continue &&
 489         test $one = $(git rev-parse HEAD~2)
 490 '
 491
 492 test_expect_success '--continue tries to commit, even for "edit"' '
 493         echo unrelated > file7 &&
 494         git add file7 &&
 495         test_tick &&
 496         git commit -m "unrelated change" &&
 497         parent=$(git rev-parse HEAD^) &&
 498         test_tick &&
 499         set_fake_editor &&
 500         FAKE_LINES="edit 1" git rebase -i HEAD^ &&
 501         echo edited > file7 &&
 502         git add file7 &&
 503         FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
 504         test edited = $(git show HEAD:file7) &&
 505         git show HEAD | grep chouette &&
 506         test $parent = $(git rev-parse HEAD^)
 507 '
 508
 509 test_expect_success 'aborted --continue does not squash commits after "edit"' '
 510         old=$(git rev-parse HEAD) &&
 511         test_tick &&
 512         set_fake_editor &&
 513         FAKE_LINES="edit 1" git rebase -i HEAD^ &&
 514         echo "edited again" > file7 &&
 515         git add file7 &&
 516         test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue &&
 517         test $old = $(git rev-parse HEAD) &&
 518         git rebase --abort
 519 '
 520
 521 test_expect_success 'auto-amend only edited commits after "edit"' '
 522         test_tick &&
 523         set_fake_editor &&
 524         FAKE_LINES="edit 1" git rebase -i HEAD^ &&
 525         echo "edited again" > file7 &&
 526         git add file7 &&
 527         FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
 528         echo "and again" > file7 &&
 529         git add file7 &&
 530         test_tick &&
 531         test_must_fail env FAKE_COMMIT_MESSAGE="and again" git rebase --continue &&
 532         git rebase --abort
 533 '
 534
 535 test_expect_success 'clean error after failed "exec"' '
 536         test_tick &&
 537         test_when_finished "git rebase --abort || :" &&
 538         set_fake_editor &&
 539         test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^ &&
 540         echo "edited again" > file7 &&
 541         git add file7 &&
 542         test_must_fail git rebase --continue 2>error &&
 543         grep "You have staged changes in your working tree." error
 544 '
 545
 546 test_expect_success 'rebase a detached HEAD' '
 547         grandparent=$(git rev-parse HEAD~2) &&
 548         git checkout $(git rev-parse HEAD) &&
 549         test_tick &&
 550         set_fake_editor &&
 551         FAKE_LINES="2 1" git rebase -i HEAD~2 &&
 552         test $grandparent = $(git rev-parse HEAD~2)
 553 '
 554
 555 test_expect_success 'rebase a commit violating pre-commit' '
 556
 557         mkdir -p .git/hooks &&
 558         write_script .git/hooks/pre-commit <<-\EOF &&
 559         test -z "$(git diff --cached --check)"
 560         EOF
 561         echo "monde! " >> file1 &&
 562         test_tick &&
 563         test_must_fail git commit -m doesnt-verify file1 &&
 564         git commit -m doesnt-verify --no-verify file1 &&
 565         test_tick &&
 566         set_fake_editor &&
 567         FAKE_LINES=2 git rebase -i HEAD~2
 568
 569 '
 570
 571 test_expect_success 'rebase with a file named HEAD in worktree' '
 572
 573         rm -fr .git/hooks &&
 574         git reset --hard &&
 575         git checkout -b branch3 A &&
 576
 577         (
 578                 GIT_AUTHOR_NAME="Squashed Away" &&
 579                 export GIT_AUTHOR_NAME &&
 580                 >HEAD &&
 581                 git add HEAD &&
 582                 git commit -m "Add head" &&
 583                 >BODY &&
 584                 git add BODY &&
 585                 git commit -m "Add body"
 586         ) &&
 587
 588         set_fake_editor &&
 589         FAKE_LINES="1 squash 2" git rebase -i to-be-rebased &&
 590         test "$(git show -s --pretty=format:%an)" = "Squashed Away"
 591
 592 '
 593
 594 test_expect_success 'do "noop" when there is nothing to cherry-pick' '
 595
 596         git checkout -b branch4 HEAD &&
 597         GIT_EDITOR=: git commit --amend \
 598                 --author="Somebody else <somebody@else.com>" &&
 599         test $(git rev-parse branch3) != $(git rev-parse branch4) &&
 600         set_fake_editor &&
 601         git rebase -i branch3 &&
 602         test $(git rev-parse branch3) = $(git rev-parse branch4)
 603
 604 '
 605
 606 test_expect_success 'submodule rebase setup' '
 607         git checkout A &&
 608         mkdir sub &&
 609         (
 610                 cd sub && git init && >elif &&
 611                 git add elif && git commit -m "submodule initial"
 612         ) &&
 613         echo 1 >file1 &&
 614         git add file1 sub &&
 615         test_tick &&
 616         git commit -m "One" &&
 617         echo 2 >file1 &&
 618         test_tick &&
 619         git commit -a -m "Two" &&
 620         (
 621                 cd sub && echo 3 >elif &&
 622                 git commit -a -m "submodule second"
 623         ) &&
 624         test_tick &&
 625         set_fake_editor &&
 626         git commit -a -m "Three changes submodule"
 627 '
 628
 629 test_expect_success 'submodule rebase -i' '
 630         set_fake_editor &&
 631         FAKE_LINES="1 squash 2 3" git rebase -i A
 632 '
 633
 634 test_expect_success 'submodule conflict setup' '
 635         git tag submodule-base &&
 636         git checkout HEAD^ &&
 637         (
 638                 cd sub && git checkout HEAD^ && echo 4 >elif &&
 639                 git add elif && git commit -m "submodule conflict"
 640         ) &&
 641         git add sub &&
 642         test_tick &&
 643         git commit -m "Conflict in submodule" &&
 644         git tag submodule-topic
 645 '
 646
 647 test_expect_success 'rebase -i continue with only submodule staged' '
 648         set_fake_editor &&
 649         test_must_fail git rebase -i submodule-base &&
 650         git add sub &&
 651         git rebase --continue &&
 652         test $(git rev-parse submodule-base) != $(git rev-parse HEAD)
 653 '
 654
 655 test_expect_success 'rebase -i continue with unstaged submodule' '
 656         git checkout submodule-topic &&
 657         git reset --hard &&
 658         set_fake_editor &&
 659         test_must_fail git rebase -i submodule-base &&
 660         git reset &&
 661         git rebase --continue &&
 662         test $(git rev-parse submodule-base) = $(git rev-parse HEAD)
 663 '
 664
 665 test_expect_success 'avoid unnecessary reset' '
 666         git checkout master &&
 667         git reset --hard &&
 668         test-chmtime =123456789 file3 &&
 669         git update-index --refresh &&
 670         HEAD=$(git rev-parse HEAD) &&
 671         set_fake_editor &&
 672         git rebase -i HEAD~4 &&
 673         test $HEAD = $(git rev-parse HEAD) &&
 674         MTIME=$(test-chmtime -v +0 file3 | sed 's/[^0-9].*$//') &&
 675         test 123456789 = $MTIME
 676 '
 677
 678 test_expect_success 'reword' '
 679         git checkout -b reword-branch master &&
 680         set_fake_editor &&
 681         FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" git rebase -i A &&
 682         git show HEAD | grep "E changed" &&
 683         test $(git rev-parse master) != $(git rev-parse HEAD) &&
 684         test $(git rev-parse master^) = $(git rev-parse HEAD^) &&
 685         FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" git rebase -i A &&
 686         git show HEAD^ | grep "D changed" &&
 687         FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" git rebase -i A &&
 688         git show HEAD~3 | grep "B changed" &&
 689         FAKE_LINES="1 reword 2 3 4" FAKE_COMMIT_MESSAGE="C changed" git rebase -i A &&
 690         git show HEAD~2 | grep "C changed"
 691 '
 692
 693 test_expect_success 'rebase -i can copy notes' '
 694         git config notes.rewrite.rebase true &&
 695         git config notes.rewriteRef "refs/notes/*" &&
 696         test_commit n1 &&
 697         test_commit n2 &&
 698         test_commit n3 &&
 699         git notes add -m"a note" n3 &&
 700         set_fake_editor &&
 701         git rebase -i --onto n1 n2 &&
 702         test "a note" = "$(git notes show HEAD)"
 703 '
 704
 705 cat >expect <<EOF
 706 an earlier note
 707
 708 a note
 709 EOF
 710
 711 test_expect_success 'rebase -i can copy notes over a fixup' '
 712         git reset --hard n3 &&
 713         git notes add -m"an earlier note" n2 &&
 714         set_fake_editor &&
 715         GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 fixup 2" git rebase -i n1 &&
 716         git notes show > output &&
 717         test_cmp expect output
 718 '
 719
 720 test_expect_success 'rebase while detaching HEAD' '
 721         git symbolic-ref HEAD &&
 722         grandparent=$(git rev-parse HEAD~2) &&
 723         test_tick &&
 724         set_fake_editor &&
 725         FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0 &&
 726         test $grandparent = $(git rev-parse HEAD~2) &&
 727         test_must_fail git symbolic-ref HEAD
 728 '
 729
 730 test_tick # Ensure that the rebased commits get a different timestamp.
 731 test_expect_success 'always cherry-pick with --no-ff' '
 732         git checkout no-ff-branch &&
 733         git tag original-no-ff-branch &&
 734         set_fake_editor &&
 735         git rebase -i --no-ff A &&
 736         touch empty &&
 737         for p in 0 1 2
 738         do
 739                 test ! $(git rev-parse HEAD~$p) = $(git rev-parse original-no-ff-branch~$p) &&
 740                 git diff HEAD~$p original-no-ff-branch~$p > out &&
 741                 test_cmp empty out
 742         done &&
 743         test $(git rev-parse HEAD~3) = $(git rev-parse original-no-ff-branch~3) &&
 744         git diff HEAD~3 original-no-ff-branch~3 > out &&
 745         test_cmp empty out
 746 '
 747
 748 test_expect_success 'set up commits with funny messages' '
 749         git checkout -b funny A &&
 750         echo >>file1 &&
 751         test_tick &&
 752         git commit -a -m "end with slash\\" &&
 753         echo >>file1 &&
 754         test_tick &&
 755         git commit -a -m "something (\000) that looks like octal" &&
 756         echo >>file1 &&
 757         test_tick &&
 758         git commit -a -m "something (\n) that looks like a newline" &&
 759         echo >>file1 &&
 760         test_tick &&
 761         git commit -a -m "another commit"
 762 '
 763
 764 test_expect_success 'rebase-i history with funny messages' '
 765         git rev-list A..funny >expect &&
 766         test_tick &&
 767         set_fake_editor &&
 768         FAKE_LINES="1 2 3 4" git rebase -i A &&
 769         git rev-list A.. >actual &&
 770         test_cmp expect actual
 771 '
 772
 773
 774 test_expect_success 'prepare for rebase -i --exec' '
 775         git checkout master &&
 776         git checkout -b execute &&
 777         test_commit one_exec main.txt one_exec &&
 778         test_commit two_exec main.txt two_exec &&
 779         test_commit three_exec main.txt three_exec
 780 '
 781
 782
 783 test_expect_success 'running "git rebase -i --exec git show HEAD"' '
 784         set_fake_editor &&
 785         git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
 786         (
 787                 FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
 788                 export FAKE_LINES &&
 789                 git rebase -i HEAD~2 >expect
 790         ) &&
 791         sed -e "1,9d" expect >expected &&
 792         test_cmp expected actual
 793 '
 794
 795
 796 test_expect_success 'running "git rebase --exec git show HEAD -i"' '
 797         git reset --hard execute &&
 798         set_fake_editor &&
 799         git rebase --exec "git show HEAD" -i HEAD~2 >actual &&
 800         (
 801                 FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
 802                 export FAKE_LINES &&
 803                 git rebase -i HEAD~2 >expect
 804         ) &&
 805         sed -e "1,9d" expect >expected &&
 806         test_cmp expected actual
 807 '
 808
 809
 810 test_expect_success 'running "git rebase -ix git show HEAD"' '
 811         git reset --hard execute &&
 812         set_fake_editor &&
 813         git rebase -ix "git show HEAD" HEAD~2 >actual &&
 814         (
 815                 FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
 816                 export FAKE_LINES &&
 817                 git rebase -i HEAD~2 >expect
 818         ) &&
 819         sed -e "1,9d" expect >expected &&
 820         test_cmp expected actual
 821 '
 822
 823
 824 test_expect_success 'rebase -ix with several <CMD>' '
 825         git reset --hard execute &&
 826         set_fake_editor &&
 827         git rebase -ix "git show HEAD; pwd" HEAD~2 >actual &&
 828         (
 829                 FAKE_LINES="1 exec_git_show_HEAD;_pwd 2 exec_git_show_HEAD;_pwd" &&
 830                 export FAKE_LINES &&
 831                 git rebase -i HEAD~2 >expect
 832         ) &&
 833         sed -e "1,9d" expect >expected &&
 834         test_cmp expected actual
 835 '
 836
 837
 838 test_expect_success 'rebase -ix with several instances of --exec' '
 839         git reset --hard execute &&
 840         set_fake_editor &&
 841         git rebase -i --exec "git show HEAD" --exec "pwd" HEAD~2 >actual &&
 842         (
 843                 FAKE_LINES="1 exec_git_show_HEAD exec_pwd 2
 844                                 exec_git_show_HEAD exec_pwd" &&
 845                 export FAKE_LINES &&
 846                 git rebase -i HEAD~2 >expect
 847         ) &&
 848         sed -e "1,11d" expect >expected &&
 849         test_cmp expected actual
 850 '
 851
 852
 853 test_expect_success 'rebase -ix with --autosquash' '
 854         git reset --hard execute &&
 855         git checkout -b autosquash &&
 856         echo second >second.txt &&
 857         git add second.txt &&
 858         git commit -m "fixup! two_exec" &&
 859         echo bis >bis.txt &&
 860         git add bis.txt &&
 861         git commit -m "fixup! two_exec" &&
 862         set_fake_editor &&
 863         (
 864                 git checkout -b autosquash_actual &&
 865                 git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual
 866         ) &&
 867         git checkout autosquash &&
 868         (
 869                 git checkout -b autosquash_expected &&
 870                 FAKE_LINES="1 fixup 3 fixup 4 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
 871                 export FAKE_LINES &&
 872                 git rebase -i HEAD~4 >expect
 873         ) &&
 874         sed -e "1,13d" expect >expected &&
 875         test_cmp expected actual
 876 '
 877
 878
 879 test_expect_success 'rebase --exec without -i shows error message' '
 880         git reset --hard execute &&
 881         set_fake_editor &&
 882         test_must_fail git rebase --exec "git show HEAD" HEAD~2 2>actual &&
 883         echo "The --exec option must be used with the --interactive option" >expected &&
 884         test_i18ncmp expected actual
 885 '
 886
 887
 888 test_expect_success 'rebase -i --exec without <CMD>' '
 889         git reset --hard execute &&
 890         set_fake_editor &&
 891         test_must_fail git rebase -i --exec 2>tmp &&
 892         sed -e "1d" tmp >actual &&
 893         test_must_fail git rebase -h >expected &&
 894         test_cmp expected actual &&
 895         git checkout master
 896 '
 897
 898 test_expect_success 'rebase -i --root re-order and drop commits' '
 899         git checkout E &&
 900         set_fake_editor &&
 901         FAKE_LINES="3 1 2 5" git rebase -i --root &&
 902         test E = $(git cat-file commit HEAD | sed -ne \$p) &&
 903         test B = $(git cat-file commit HEAD^ | sed -ne \$p) &&
 904         test A = $(git cat-file commit HEAD^^ | sed -ne \$p) &&
 905         test C = $(git cat-file commit HEAD^^^ | sed -ne \$p) &&
 906         test 0 = $(git cat-file commit HEAD^^^ | grep -c ^parent\ )
 907 '
 908
 909 test_expect_success 'rebase -i --root retain root commit author and message' '
 910         git checkout A &&
 911         echo B >file7 &&
 912         git add file7 &&
 913         GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
 914         set_fake_editor &&
 915         FAKE_LINES="2" git rebase -i --root &&
 916         git cat-file commit HEAD | grep -q "^author Twerp Snog" &&
 917         git cat-file commit HEAD | grep -q "^different author$"
 918 '
 919
 920 test_expect_success 'rebase -i --root temporary sentinel commit' '
 921         git checkout B &&
 922         set_fake_editor &&
 923         test_must_fail env FAKE_LINES="2" git rebase -i --root &&
 924         git cat-file commit HEAD | grep "^tree 4b825dc642cb" &&
 925         git rebase --abort
 926 '
 927
 928 test_expect_success 'rebase -i --root fixup root commit' '
 929         git checkout B &&
 930         set_fake_editor &&
 931         FAKE_LINES="1 fixup 2" git rebase -i --root &&
 932         test A = $(git cat-file commit HEAD | sed -ne \$p) &&
 933         test B = $(git show HEAD:file1) &&
 934         test 0 = $(git cat-file commit HEAD | grep -c ^parent\ )
 935 '
 936
 937 test_expect_success 'rebase --edit-todo does not works on non-interactive rebase' '
 938         git reset --hard &&
 939         git checkout conflict-branch &&
 940         set_fake_editor &&
 941         test_must_fail git rebase --onto HEAD~2 HEAD~ &&
 942         test_must_fail git rebase --edit-todo &&
 943         git rebase --abort
 944 '
 945
 946 test_expect_success 'rebase --edit-todo can be used to modify todo' '
 947         git reset --hard &&
 948         git checkout no-conflict-branch^0 &&
 949         set_fake_editor &&
 950         FAKE_LINES="edit 1 2 3" git rebase -i HEAD~3 &&
 951         FAKE_LINES="2 1" git rebase --edit-todo &&
 952         git rebase --continue &&
 953         test M = $(git cat-file commit HEAD^ | sed -ne \$p) &&
 954         test L = $(git cat-file commit HEAD | sed -ne \$p)
 955 '
 956
 957 test_expect_success 'rebase -i produces readable reflog' '
 958         git reset --hard &&
 959         git branch -f branch-reflog-test H &&
 960         set_fake_editor &&
 961         git rebase -i --onto I F branch-reflog-test &&
 962         cat >expect <<-\EOF &&
 963         rebase -i (finish): returning to refs/heads/branch-reflog-test
 964         rebase -i (pick): H
 965         rebase -i (pick): G
 966         rebase -i (start): checkout I
 967         EOF
 968         git reflog -n4 HEAD |
 969         sed "s/[^:]*: //" >actual &&
 970         test_cmp expect actual
 971 '
 972
 973 test_expect_success 'rebase -i respects core.commentchar' '
 974         git reset --hard &&
 975         git checkout E^0 &&
 976         test_config core.commentchar "\\" &&
 977         write_script remove-all-but-first.sh <<-\EOF &&
 978         sed -e "2,\$s/^/\\\\/" "$1" >"$1.tmp" &&
 979         mv "$1.tmp" "$1"
 980         EOF
 981         test_set_editor "$(pwd)/remove-all-but-first.sh" &&
 982         git rebase -i B &&
 983         test B = $(git cat-file commit HEAD^ | sed -ne \$p)
 984 '
 985
 986 test_expect_success 'rebase -i, with <onto> and <upstream> specified as :/quuxery' '
 987         test_when_finished "git branch -D torebase" &&
 988         git checkout -b torebase branch1 &&
 989         upstream=$(git rev-parse ":/J") &&
 990         onto=$(git rev-parse ":/A") &&
 991         git rebase --onto $onto $upstream &&
 992         git reset --hard branch1 &&
 993         git rebase --onto ":/A" ":/J" &&
 994         git checkout branch1
 995 '
 996
 997 test_expect_success 'rebase -i with --strategy and -X' '
 998         git checkout -b conflict-merge-use-theirs conflict-branch &&
 999         git reset --hard HEAD^ &&
1000         echo five >conflict &&
1001         echo Z >file1 &&
1002         git commit -a -m "one file conflict" &&
1003         EDITOR=true git rebase -i --strategy=recursive -Xours conflict-branch &&
1004         test $(git show conflict-branch:conflict) = $(cat conflict) &&
1005         test $(cat file1) = Z
1006 '
1007
1008 test_expect_success 'interrupted rebase -i with --strategy and -X' '
1009         git checkout -b conflict-merge-use-theirs-interrupted conflict-branch &&
1010         git reset --hard HEAD^ &&
1011         >breakpoint &&
1012         git add breakpoint &&
1013         git commit -m "breakpoint for interactive mode" &&
1014         echo five >conflict &&
1015         echo Z >file1 &&
1016         git commit -a -m "one file conflict" &&
1017         set_fake_editor &&
1018         FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive -Xours conflict-branch &&
1019         git rebase --continue &&
1020         test $(git show conflict-branch:conflict) = $(cat conflict) &&
1021         test $(cat file1) = Z
1022 '
1023
1024 test_expect_success 'rebase -i error on commits with \ in message' '
1025         current_head=$(git rev-parse HEAD) &&
1026         test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" &&
1027         test_commit TO-REMOVE will-conflict old-content &&
1028         test_commit "\temp" will-conflict new-content dummy &&
1029         test_must_fail env EDITOR=true git rebase -i HEAD^ --onto HEAD^^ 2>error &&
1030         test_expect_code 1 grep  "      emp" error
1031 '
1032
1033 test_expect_success 'short SHA-1 setup' '
1034         test_when_finished "git checkout master" &&
1035         git checkout --orphan collide &&
1036         git rm -rf . &&
1037         (
1038         unset test_tick &&
1039         test_commit collide1 collide &&
1040         test_commit --notick collide2 collide &&
1041         test_commit --notick collide3 collide
1042         )
1043 '
1044
1045 test_expect_success 'short SHA-1 collide' '
1046         test_when_finished "reset_rebase && git checkout master" &&
1047         git checkout collide &&
1048         (
1049         unset test_tick &&
1050         test_tick &&
1051         set_fake_editor &&
1052         FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \
1053         FAKE_LINES="reword 1 2" git rebase -i HEAD~2
1054         )
1055 '
1056
1057 test_expect_success 'respect core.abbrev' '
1058         git config core.abbrev 12 &&
1059         set_cat_todo_editor &&
1060         test_must_fail git rebase -i HEAD~4 >todo-list &&
1061         test 4 = $(grep -c "pick [0-9a-f]\{12,\}" todo-list)
1062 '
1063
1064 test_expect_success 'todo count' '
1065         write_script dump-raw.sh <<-\EOF &&
1066                 cat "$1"
1067         EOF
1068         test_set_editor "$(pwd)/dump-raw.sh" &&
1069         git rebase -i HEAD~4 >actual &&
1070         grep "^# Rebase ..* onto ..* ([0-9]" actual
1071 '
1072
1073 test_expect_success 'rebase -i commits that overwrite untracked files (pick)' '
1074         git checkout --force branch2 &&
1075         git clean -f &&
1076         set_fake_editor &&
1077         FAKE_LINES="edit 1 2" git rebase -i A &&
1078         test_cmp_rev HEAD F &&
1079         test_path_is_missing file6 &&
1080         >file6 &&
1081         test_must_fail git rebase --continue &&
1082         test_cmp_rev HEAD F &&
1083         rm file6 &&
1084         git rebase --continue &&
1085         test_cmp_rev HEAD I
1086 '
1087
1088 test_expect_success 'rebase -i commits that overwrite untracked files (squash)' '
1089         git checkout --force branch2 &&
1090         git clean -f &&
1091         git tag original-branch2 &&
1092         set_fake_editor &&
1093         FAKE_LINES="edit 1 squash 2" git rebase -i A &&
1094         test_cmp_rev HEAD F &&
1095         test_path_is_missing file6 &&
1096         >file6 &&
1097         test_must_fail git rebase --continue &&
1098         test_cmp_rev HEAD F &&
1099         rm file6 &&
1100         git rebase --continue &&
1101         test $(git cat-file commit HEAD | sed -ne \$p) = I &&
1102         git reset --hard original-branch2
1103 '
1104
1105 test_expect_success 'rebase -i commits that overwrite untracked files (no ff)' '
1106         git checkout --force branch2 &&
1107         git clean -f &&
1108         set_fake_editor &&
1109         FAKE_LINES="edit 1 2" git rebase -i --no-ff A &&
1110         test $(git cat-file commit HEAD | sed -ne \$p) = F &&
1111         test_path_is_missing file6 &&
1112         >file6 &&
1113         test_must_fail git rebase --continue &&
1114         test $(git cat-file commit HEAD | sed -ne \$p) = F &&
1115         rm file6 &&
1116         git rebase --continue &&
1117         test $(git cat-file commit HEAD | sed -ne \$p) = I
1118 '
1119
1120 test_expect_success 'rebase --continue removes CHERRY_PICK_HEAD' '
1121         git checkout -b commit-to-skip &&
1122         for double in X 3 1
1123         do
1124                 test_seq 5 | sed "s/$double/&&/" >seq &&
1125                 git add seq &&
1126                 test_tick &&
1127                 git commit -m seq-$double
1128         done &&
1129         git tag seq-onto &&
1130         git reset --hard HEAD~2 &&
1131         git cherry-pick seq-onto &&
1132         set_fake_editor &&
1133         test_must_fail env FAKE_LINES= git rebase -i seq-onto &&
1134         test -d .git/rebase-merge &&
1135         git rebase --continue &&
1136         git diff --exit-code seq-onto &&
1137         test ! -d .git/rebase-merge &&
1138         test ! -f .git/CHERRY_PICK_HEAD
1139 '
1140
1141 rebase_setup_and_clean () {
1142         test_when_finished "
1143                 git checkout master &&
1144                 test_might_fail git branch -D $1 &&
1145                 test_might_fail git rebase --abort
1146         " &&
1147         git checkout -b $1 master
1148 }
1149
1150 test_expect_success 'drop' '
1151         rebase_setup_and_clean drop-test &&
1152         set_fake_editor &&
1153         FAKE_LINES="1 drop 2 3 drop 4 5" git rebase -i --root &&
1154         test E = $(git cat-file commit HEAD | sed -ne \$p) &&
1155         test C = $(git cat-file commit HEAD^ | sed -ne \$p) &&
1156         test A = $(git cat-file commit HEAD^^ | sed -ne \$p)
1157 '
1158
1159 cat >expect <<EOF
1160 Successfully rebased and updated refs/heads/missing-commit.
1161 EOF
1162
1163 test_expect_success 'rebase -i respects rebase.missingCommitsCheck = ignore' '
1164         test_config rebase.missingCommitsCheck ignore &&
1165         rebase_setup_and_clean missing-commit &&
1166         set_fake_editor &&
1167         FAKE_LINES="1 2 3 4" \
1168                 git rebase -i --root 2>actual &&
1169         test D = $(git cat-file commit HEAD | sed -ne \$p) &&
1170         test_cmp expect actual
1171 '
1172
1173 cat >expect <<EOF
1174 Warning: some commits may have been dropped accidentally.
1175 Dropped commits (newer to older):
1176  - $(git rev-list --pretty=oneline --abbrev-commit -1 master)
1177 To avoid this message, use "drop" to explicitly remove a commit.
1178
1179 Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
1180 The possible behaviours are: ignore, warn, error.
1181
1182 Successfully rebased and updated refs/heads/missing-commit.
1183 EOF
1184
1185 test_expect_success 'rebase -i respects rebase.missingCommitsCheck = warn' '
1186         test_config rebase.missingCommitsCheck warn &&
1187         rebase_setup_and_clean missing-commit &&
1188         set_fake_editor &&
1189         FAKE_LINES="1 2 3 4" \
1190                 git rebase -i --root 2>actual &&
1191         test_cmp expect actual &&
1192         test D = $(git cat-file commit HEAD | sed -ne \$p)
1193 '
1194
1195 cat >expect <<EOF
1196 Warning: some commits may have been dropped accidentally.
1197 Dropped commits (newer to older):
1198  - $(git rev-list --pretty=oneline --abbrev-commit -1 master)
1199  - $(git rev-list --pretty=oneline --abbrev-commit -1 master~2)
1200 To avoid this message, use "drop" to explicitly remove a commit.
1201
1202 Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
1203 The possible behaviours are: ignore, warn, error.
1204
1205 You can fix this with 'git rebase --edit-todo'.
1206 Or you can abort the rebase with 'git rebase --abort'.
1207 EOF
1208
1209 test_expect_success 'rebase -i respects rebase.missingCommitsCheck = error' '
1210         test_config rebase.missingCommitsCheck error &&
1211         rebase_setup_and_clean missing-commit &&
1212         set_fake_editor &&
1213         test_must_fail env FAKE_LINES="1 2 4" \
1214                 git rebase -i --root 2>actual &&
1215         test_cmp expect actual &&
1216         cp .git/rebase-merge/git-rebase-todo.backup \
1217                 .git/rebase-merge/git-rebase-todo &&
1218         FAKE_LINES="1 2 drop 3 4 drop 5" \
1219                 git rebase --edit-todo &&
1220         git rebase --continue &&
1221         test D = $(git cat-file commit HEAD | sed -ne \$p) &&
1222         test B = $(git cat-file commit HEAD^ | sed -ne \$p)
1223 '
1224
1225 cat >expect <<EOF
1226 Warning: the command isn't recognized in the following line:
1227  - badcmd $(git rev-list --oneline -1 master~1)
1228
1229 You can fix this with 'git rebase --edit-todo'.
1230 Or you can abort the rebase with 'git rebase --abort'.
1231 EOF
1232
1233 test_expect_success 'static check of bad command' '
1234         rebase_setup_and_clean bad-cmd &&
1235         set_fake_editor &&
1236         test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \
1237                 git rebase -i --root 2>actual &&
1238         test_cmp expect actual &&
1239         FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo &&
1240         git rebase --continue &&
1241         test E = $(git cat-file commit HEAD | sed -ne \$p) &&
1242         test C = $(git cat-file commit HEAD^ | sed -ne \$p)
1243 '
1244
1245 test_expect_success 'tabs and spaces are accepted in the todolist' '
1246         rebase_setup_and_clean indented-comment &&
1247         write_script add-indent.sh <<-\EOF &&
1248         (
1249                 # Turn single spaces into space/tab mix
1250                 sed "1s/ /      /g; 2s/ /  /g; 3s/ /    /g" "$1"
1251                 printf "\n\t# comment\n #more\n\t # comment\n"
1252         ) >"$1.new"
1253         mv "$1.new" "$1"
1254         EOF
1255         test_set_editor "$(pwd)/add-indent.sh" &&
1256         git rebase -i HEAD^^^ &&
1257         test E = $(git cat-file commit HEAD | sed -ne \$p)
1258 '
1259
1260 cat >expect <<EOF
1261 Warning: the SHA-1 is missing or isn't a commit in the following line:
1262  - edit XXXXXXX False commit
1263
1264 You can fix this with 'git rebase --edit-todo'.
1265 Or you can abort the rebase with 'git rebase --abort'.
1266 EOF
1267
1268 test_expect_success 'static check of bad SHA-1' '
1269         rebase_setup_and_clean bad-sha &&
1270         set_fake_editor &&
1271         test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \
1272                 git rebase -i --root 2>actual &&
1273         test_cmp expect actual &&
1274         FAKE_LINES="1 2 4 5 6" git rebase --edit-todo &&
1275         git rebase --continue &&
1276         test E = $(git cat-file commit HEAD | sed -ne \$p)
1277 '
1278
1279 test_expect_success 'editor saves as CR/LF' '
1280         git checkout -b with-crlf &&
1281         write_script add-crs.sh <<-\EOF &&
1282         sed -e "s/\$/Q/" <"$1" | tr Q "\\015" >"$1".new &&
1283         mv -f "$1".new "$1"
1284         EOF
1285         (
1286                 test_set_editor "$(pwd)/add-crs.sh" &&
1287                 git rebase -i HEAD^
1288         )
1289 '
1290
1291 test_done