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