t / t3404-rebase-interactive.shon commit Teach rebase an interactive mode (1b1dce4)
   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'
  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
  23test_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
  64cat > fake-editor.sh << EOF
  65#!/bin/sh
  66test "\$1" = .git/COMMIT_EDITMSG && exit
  67test -z "\$FAKE_LINES" && exit
  68grep -v "^#" < "\$1" > "\$1".tmp
  69rm "\$1"
  70cat "\$1".tmp
  71action=pick
  72for line in \$FAKE_LINES; do
  73        case \$line in
  74        squash)
  75                action="\$line";;
  76        *)
  77                echo sed -n "\${line}s/^pick/\$action/p"
  78                sed -n "\${line}p" < "\$1".tmp
  79                sed -n "\${line}s/^pick/\$action/p" < "\$1".tmp >> "\$1"
  80                action=pick;;
  81        esac
  82done
  83EOF
  84
  85chmod a+x fake-editor.sh
  86VISUAL="$(pwd)/fake-editor.sh"
  87export VISUAL
  88
  89test_expect_success 'no changes are a nop' '
  90        git rebase -i F &&
  91        test $(git rev-parse I) = $(git rev-parse HEAD)
  92'
  93
  94test_expect_success 'rebase on top of a non-conflicting commit' '
  95        git checkout branch1 &&
  96        git tag original-branch1 &&
  97        git rebase -i branch2 &&
  98        test file6 = $(git diff --name-only original-branch1) &&
  99        test $(git rev-parse I) = $(git rev-parse HEAD~2)
 100'
 101
 102test_expect_success 'exchange two commits' '
 103        FAKE_LINES="2 1" git rebase -i HEAD~2 &&
 104        test H = $(git cat-file commit HEAD^ | tail -n 1) &&
 105        test G = $(git cat-file commit HEAD | tail -n 1)
 106'
 107
 108cat > expect << EOF
 109diff --git a/file1 b/file1
 110index e69de29..00750ed 100644
 111--- a/file1
 112+++ b/file1
 113@@ -0,0 +1 @@
 114+3
 115EOF
 116
 117cat > expect2 << EOF
 118<<<<<<< HEAD:file1
 1192
 120=======
 1213
 122>>>>>>> b7ca976... G:file1
 123EOF
 124
 125test_expect_success 'stop on conflicting pick' '
 126        git tag new-branch1 &&
 127        ! git rebase -i master &&
 128        diff -u expect .git/.dotest-merge/patch &&
 129        diff -u expect2 file1 &&
 130        test 4 = $(grep -v "^#" < .git/.dotest-merge/done | wc -l) &&
 131        test 0 = $(grep -v "^#" < .git/.dotest-merge/todo | wc -l)
 132'
 133
 134test_expect_success 'abort' '
 135        git rebase --abort &&
 136        test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
 137        ! test -d .git/.dotest-merge
 138'
 139
 140test_expect_success 'retain authorship' '
 141        echo A > file7 &&
 142        git add file7 &&
 143        GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
 144        git tag twerp &&
 145        git rebase -i --onto master HEAD^ &&
 146        git show HEAD | grep "^Author: Twerp Snog"
 147'
 148
 149test_expect_success 'squash' '
 150        git reset --hard twerp &&
 151        echo B > file7 &&
 152        GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
 153        echo "******************************" &&
 154        FAKE_LINES="1 squash 2" git rebase -i --onto master HEAD~2 &&
 155        test B = $(cat file7) &&
 156        test $(git rev-parse HEAD^) = $(git rev-parse master)
 157'
 158
 159test_expect_success 'retain authorship when squashing' '
 160        git show HEAD | grep "^Author: Nitfol"
 161'
 162
 163test_done