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 . ./test-lib.sh
  12
  13 # set up two branches like this:
  14 #
  15 # A - B - C - D - E
  16 #   \
  17 #     F - G - H
  18 #       \
  19 #         I
  20 #
  21 # where B, D and G touch the same file.
  22
  23 test_expect_success 'setup' '
  24         : > file1 &&
  25         git add file1 &&
  26         test_tick &&
  27         git commit -m A &&
  28         git tag A &&
  29         echo 1 > file1 &&
  30         test_tick &&
  31         git commit -m B file1 &&
  32         : > file2 &&
  33         git add file2 &&
  34         test_tick &&
  35         git commit -m C &&
  36         echo 2 > file1 &&
  37         test_tick &&
  38         git commit -m D file1 &&
  39         : > file3 &&
  40         git add file3 &&
  41         test_tick &&
  42         git commit -m E &&
  43         git checkout -b branch1 A &&
  44         : > file4 &&
  45         git add file4 &&
  46         test_tick &&
  47         git commit -m F &&
  48         git tag F &&
  49         echo 3 > file1 &&
  50         test_tick &&
  51         git commit -m G file1 &&
  52         : > file5 &&
  53         git add file5 &&
  54         test_tick &&
  55         git commit -m H &&
  56         git checkout -b branch2 F &&
  57         : > file6 &&
  58         git add file6 &&
  59         test_tick &&
  60         git commit -m I &&
  61         git tag I
  62 '
  63
  64 echo "#!$SHELL_PATH" >fake-editor.sh
  65 cat >> fake-editor.sh <<\EOF
  66 case "$1" in
  67 */COMMIT_EDITMSG)
  68         test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1"
  69         test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1"
  70         exit
  71         ;;
  72 esac
  73 test -z "$EXPECT_COUNT" ||
  74         test "$EXPECT_COUNT" = $(sed -e '/^#/d' -e '/^$/d' < "$1" | wc -l) ||
  75         exit
  76 test -z "$FAKE_LINES" && exit
  77 grep -v '^#' < "$1" > "$1".tmp
  78 rm -f "$1"
  79 cat "$1".tmp
  80 action=pick
  81 for line in $FAKE_LINES; do
  82         case $line in
  83         squash|edit)
  84                 action="$line";;
  85         *)
  86                 echo sed -n "${line}s/^pick/$action/p"
  87                 sed -n "${line}p" < "$1".tmp
  88                 sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1"
  89                 action=pick;;
  90         esac
  91 done
  92 EOF
  93
  94 test_set_editor "$(pwd)/fake-editor.sh"
  95 chmod a+x fake-editor.sh
  96
  97 test_expect_success 'no changes are a nop' '
  98         git rebase -i F &&
  99         test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
 100         test $(git rev-parse I) = $(git rev-parse HEAD)
 101 '
 102
 103 test_expect_success 'test the [branch] option' '
 104         git checkout -b dead-end &&
 105         git rm file6 &&
 106         git commit -m "stop here" &&
 107         git rebase -i F branch2 &&
 108         test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
 109         test $(git rev-parse I) = $(git rev-parse branch2) &&
 110         test $(git rev-parse I) = $(git rev-parse HEAD)
 111 '
 112
 113 test_expect_success 'test --onto <branch>' '
 114         git checkout -b test-onto branch2 &&
 115         git rebase -i --onto branch1 F &&
 116         test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" &&
 117         test $(git rev-parse HEAD^) = $(git rev-parse branch1) &&
 118         test $(git rev-parse I) = $(git rev-parse branch2)
 119 '
 120
 121 test_expect_success 'rebase on top of a non-conflicting commit' '
 122         git checkout branch1 &&
 123         git tag original-branch1 &&
 124         git rebase -i branch2 &&
 125         test file6 = $(git diff --name-only original-branch1) &&
 126         test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
 127         test $(git rev-parse I) = $(git rev-parse branch2) &&
 128         test $(git rev-parse I) = $(git rev-parse HEAD~2)
 129 '
 130
 131 test_expect_success 'reflog for the branch shows state before rebase' '
 132         test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
 133 '
 134
 135 test_expect_success 'exchange two commits' '
 136         FAKE_LINES="2 1" git rebase -i HEAD~2 &&
 137         test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
 138         test G = $(git cat-file commit HEAD | sed -ne \$p)
 139 '
 140
 141 cat > expect << EOF
 142 diff --git a/file1 b/file1
 143 index e69de29..00750ed 100644
 144 --- a/file1
 145 +++ b/file1
 146 @@ -0,0 +1 @@
 147 +3
 148 EOF
 149
 150 cat > expect2 << EOF
 151 <<<<<<< HEAD:file1
 152 2
 153 =======
 154 3
 155 >>>>>>> b7ca976... G:file1
 156 EOF
 157
 158 test_expect_success 'stop on conflicting pick' '
 159         git tag new-branch1 &&
 160         test_must_fail git rebase -i master &&
 161         test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" &&
 162         test_cmp expect .git/rebase-merge/patch &&
 163         test_cmp expect2 file1 &&
 164         test "$(git diff --name-status |
 165                 sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
 166         test 4 = $(grep -v "^#" < .git/rebase-merge/done | wc -l) &&
 167         test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
 168 '
 169
 170 test_expect_success 'abort' '
 171         git rebase --abort &&
 172         test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
 173         test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
 174         ! test -d .git/rebase-merge
 175 '
 176
 177 test_expect_success 'retain authorship' '
 178         echo A > file7 &&
 179         git add file7 &&
 180         test_tick &&
 181         GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
 182         git tag twerp &&
 183         git rebase -i --onto master HEAD^ &&
 184         git show HEAD | grep "^Author: Twerp Snog"
 185 '
 186
 187 test_expect_success 'squash' '
 188         git reset --hard twerp &&
 189         echo B > file7 &&
 190         test_tick &&
 191         GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
 192         echo "******************************" &&
 193         FAKE_LINES="1 squash 2" git rebase -i --onto master HEAD~2 &&
 194         test B = $(cat file7) &&
 195         test $(git rev-parse HEAD^) = $(git rev-parse master)
 196 '
 197
 198 test_expect_success 'retain authorship when squashing' '
 199         git show HEAD | grep "^Author: Twerp Snog"
 200 '
 201
 202 test_expect_success '-p handles "no changes" gracefully' '
 203         HEAD=$(git rev-parse HEAD) &&
 204         git rebase -i -p HEAD^ &&
 205         git update-index --refresh &&
 206         git diff-files --quiet &&
 207         git diff-index --quiet --cached HEAD -- &&
 208         test $HEAD = $(git rev-parse HEAD)
 209 '
 210
 211 test_expect_success 'preserve merges with -p' '
 212         git checkout -b to-be-preserved master^ &&
 213         : > unrelated-file &&
 214         git add unrelated-file &&
 215         test_tick &&
 216         git commit -m "unrelated" &&
 217         git checkout -b another-branch master &&
 218         echo B > file1 &&
 219         test_tick &&
 220         git commit -m J file1 &&
 221         test_tick &&
 222         git merge to-be-preserved &&
 223         echo C > file1 &&
 224         test_tick &&
 225         git commit -m K file1 &&
 226         echo D > file1 &&
 227         test_tick &&
 228         git commit -m L1 file1 &&
 229         git checkout HEAD^ &&
 230         echo 1 > unrelated-file &&
 231         test_tick &&
 232         git commit -m L2 unrelated-file &&
 233         test_tick &&
 234         git merge another-branch &&
 235         echo E > file1 &&
 236         test_tick &&
 237         git commit -m M file1 &&
 238         git checkout -b to-be-rebased &&
 239         test_tick &&
 240         git rebase -i -p --onto branch1 master &&
 241         git update-index --refresh &&
 242         git diff-files --quiet &&
 243         git diff-index --quiet --cached HEAD -- &&
 244         test $(git rev-parse HEAD~6) = $(git rev-parse branch1) &&
 245         test $(git rev-parse HEAD~4^2) = $(git rev-parse to-be-preserved) &&
 246         test $(git rev-parse HEAD^^2^) = $(git rev-parse HEAD^^^) &&
 247         test $(git show HEAD~5:file1) = B &&
 248         test $(git show HEAD~3:file1) = C &&
 249         test $(git show HEAD:file1) = E &&
 250         test $(git show HEAD:unrelated-file) = 1
 251 '
 252
 253 test_expect_success 'edit ancestor with -p' '
 254         FAKE_LINES="1 edit 2 3 4" git rebase -i -p HEAD~3 &&
 255         echo 2 > unrelated-file &&
 256         test_tick &&
 257         git commit -m L2-modified --amend unrelated-file &&
 258         git rebase --continue &&
 259         git update-index --refresh &&
 260         git diff-files --quiet &&
 261         git diff-index --quiet --cached HEAD -- &&
 262         test $(git show HEAD:unrelated-file) = 2
 263 '
 264
 265 test_expect_success '--continue tries to commit' '
 266         test_tick &&
 267         test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
 268         echo resolved > file1 &&
 269         git add file1 &&
 270         FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
 271         test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&
 272         git show HEAD | grep chouette
 273 '
 274
 275 test_expect_success 'verbose flag is heeded, even after --continue' '
 276         git reset --hard HEAD@{1} &&
 277         test_tick &&
 278         test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
 279         echo resolved > file1 &&
 280         git add file1 &&
 281         git rebase --continue > output &&
 282         grep "^ file1 |    2 +-$" output
 283 '
 284
 285 test_expect_success 'multi-squash only fires up editor once' '
 286         base=$(git rev-parse HEAD~4) &&
 287         FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \
 288                 git rebase -i $base &&
 289         test $base = $(git rev-parse HEAD^) &&
 290         test 1 = $(git show | grep ONCE | wc -l)
 291 '
 292
 293 test_expect_success 'squash works as expected' '
 294         for n in one two three four
 295         do
 296                 echo $n >> file$n &&
 297                 git add file$n &&
 298                 git commit -m $n
 299         done &&
 300         one=$(git rev-parse HEAD~3) &&
 301         FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
 302         test $one = $(git rev-parse HEAD~2)
 303 '
 304
 305 test_expect_success 'interrupted squash works as expected' '
 306         for n in one two three four
 307         do
 308                 echo $n >> conflict &&
 309                 git add conflict &&
 310                 git commit -m $n
 311         done &&
 312         one=$(git rev-parse HEAD~3) &&
 313         (
 314                 FAKE_LINES="1 squash 3 2" &&
 315                 export FAKE_LINES &&
 316                 test_must_fail git rebase -i HEAD~3
 317         ) &&
 318         (echo one; echo two; echo four) > conflict &&
 319         git add conflict &&
 320         test_must_fail git rebase --continue &&
 321         echo resolved > conflict &&
 322         git add conflict &&
 323         git rebase --continue &&
 324         test $one = $(git rev-parse HEAD~2)
 325 '
 326
 327 test_expect_success 'interrupted squash works as expected (case 2)' '
 328         for n in one two three four
 329         do
 330                 echo $n >> conflict &&
 331                 git add conflict &&
 332                 git commit -m $n
 333         done &&
 334         one=$(git rev-parse HEAD~3) &&
 335         (
 336                 FAKE_LINES="3 squash 1 2" &&
 337                 export FAKE_LINES &&
 338                 test_must_fail git rebase -i HEAD~3
 339         ) &&
 340         (echo one; echo four) > conflict &&
 341         git add conflict &&
 342         test_must_fail git rebase --continue &&
 343         (echo one; echo two; echo four) > conflict &&
 344         git add conflict &&
 345         test_must_fail git rebase --continue &&
 346         echo resolved > conflict &&
 347         git add conflict &&
 348         git rebase --continue &&
 349         test $one = $(git rev-parse HEAD~2)
 350 '
 351
 352 test_expect_success 'ignore patch if in upstream' '
 353         HEAD=$(git rev-parse HEAD) &&
 354         git checkout -b has-cherry-picked HEAD^ &&
 355         echo unrelated > file7 &&
 356         git add file7 &&
 357         test_tick &&
 358         git commit -m "unrelated change" &&
 359         git cherry-pick $HEAD &&
 360         EXPECT_COUNT=1 git rebase -i $HEAD &&
 361         test $HEAD = $(git rev-parse HEAD^)
 362 '
 363
 364 test_expect_success '--continue tries to commit, even for "edit"' '
 365         parent=$(git rev-parse HEAD^) &&
 366         test_tick &&
 367         FAKE_LINES="edit 1" git rebase -i HEAD^ &&
 368         echo edited > file7 &&
 369         git add file7 &&
 370         FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
 371         test edited = $(git show HEAD:file7) &&
 372         git show HEAD | grep chouette &&
 373         test $parent = $(git rev-parse HEAD^)
 374 '
 375
 376 test_expect_success 'aborted --continue does not squash commits after "edit"' '
 377         old=$(git rev-parse HEAD) &&
 378         test_tick &&
 379         FAKE_LINES="edit 1" git rebase -i HEAD^ &&
 380         echo "edited again" > file7 &&
 381         git add file7 &&
 382         (
 383                 FAKE_COMMIT_MESSAGE=" " &&
 384                 export FAKE_COMMIT_MESSAGE &&
 385                 test_must_fail git rebase --continue
 386         ) &&
 387         test $old = $(git rev-parse HEAD) &&
 388         git rebase --abort
 389 '
 390
 391 test_expect_success 'auto-amend only edited commits after "edit"' '
 392         test_tick &&
 393         FAKE_LINES="edit 1" git rebase -i HEAD^ &&
 394         echo "edited again" > file7 &&
 395         git add file7 &&
 396         FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
 397         echo "and again" > file7 &&
 398         git add file7 &&
 399         test_tick &&
 400         (
 401                 FAKE_COMMIT_MESSAGE="and again" &&
 402                 export FAKE_COMMIT_MESSAGE &&
 403                 test_must_fail git rebase --continue
 404         ) &&
 405         git rebase --abort
 406 '
 407
 408 test_expect_success 'rebase a detached HEAD' '
 409         grandparent=$(git rev-parse HEAD~2) &&
 410         git checkout $(git rev-parse HEAD) &&
 411         test_tick &&
 412         FAKE_LINES="2 1" git rebase -i HEAD~2 &&
 413         test $grandparent = $(git rev-parse HEAD~2)
 414 '
 415
 416 test_expect_success 'rebase a commit violating pre-commit' '
 417
 418         mkdir -p .git/hooks &&
 419         PRE_COMMIT=.git/hooks/pre-commit &&
 420         echo "#!/bin/sh" > $PRE_COMMIT &&
 421         echo "test -z \"\$(git diff --cached --check)\"" >> $PRE_COMMIT &&
 422         chmod a+x $PRE_COMMIT &&
 423         echo "monde! " >> file1 &&
 424         test_tick &&
 425         test_must_fail git commit -m doesnt-verify file1 &&
 426         git commit -m doesnt-verify --no-verify file1 &&
 427         test_tick &&
 428         FAKE_LINES=2 git rebase -i HEAD~2
 429
 430 '
 431
 432 test_expect_success 'rebase with a file named HEAD in worktree' '
 433
 434         rm -fr .git/hooks &&
 435         git reset --hard &&
 436         git checkout -b branch3 A &&
 437
 438         (
 439                 GIT_AUTHOR_NAME="Squashed Away" &&
 440                 export GIT_AUTHOR_NAME &&
 441                 >HEAD &&
 442                 git add HEAD &&
 443                 git commit -m "Add head" &&
 444                 >BODY &&
 445                 git add BODY &&
 446                 git commit -m "Add body"
 447         ) &&
 448
 449         FAKE_LINES="1 squash 2" git rebase -i to-be-rebased &&
 450         test "$(git show -s --pretty=format:%an)" = "Squashed Away"
 451
 452 '
 453
 454 test_expect_success 'do "noop" when there is nothing to cherry-pick' '
 455
 456         git checkout -b branch4 HEAD &&
 457         GIT_EDITOR=: git commit --amend \
 458                 --author="Somebody else <somebody@else.com>"
 459         test $(git rev-parse branch3) != $(git rev-parse branch4) &&
 460         git rebase -i branch3 &&
 461         test $(git rev-parse branch3) = $(git rev-parse branch4)
 462
 463 '
 464
 465 test_done