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 cat > fake-editor.sh <<\EOF
  65 #!/bin/sh
  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)
  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 chmod a+x fake-editor.sh
  95 VISUAL="$(pwd)/fake-editor.sh"
  96 export VISUAL
  97
  98 test_expect_success 'no changes are a nop' '
  99         git rebase -i F &&
 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 rev-parse I) = $(git rev-parse HEAD)
 109 '
 110
 111 test_expect_success 'rebase on top of a non-conflicting commit' '
 112         git checkout branch1 &&
 113         git tag original-branch1 &&
 114         git rebase -i branch2 &&
 115         test file6 = $(git diff --name-only original-branch1) &&
 116         test $(git rev-parse I) = $(git rev-parse HEAD~2)
 117 '
 118
 119 test_expect_success 'reflog for the branch shows state before rebase' '
 120         test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
 121 '
 122
 123 test_expect_success 'exchange two commits' '
 124         FAKE_LINES="2 1" git rebase -i HEAD~2 &&
 125         test H = $(git cat-file commit HEAD^ | tail -n 1) &&
 126         test G = $(git cat-file commit HEAD | tail -n 1)
 127 '
 128
 129 cat > expect << EOF
 130 diff --git a/file1 b/file1
 131 index e69de29..00750ed 100644
 132 --- a/file1
 133 +++ b/file1
 134 @@ -0,0 +1 @@
 135 +3
 136 EOF
 137
 138 cat > expect2 << EOF
 139 <<<<<<< HEAD:file1
 140 2
 141 =======
 142 3
 143 >>>>>>> b7ca976... G:file1
 144 EOF
 145
 146 test_expect_success 'stop on conflicting pick' '
 147         git tag new-branch1 &&
 148         ! git rebase -i master &&
 149         diff -u expect .git/.dotest-merge/patch &&
 150         diff -u expect2 file1 &&
 151         test 4 = $(grep -v "^#" < .git/.dotest-merge/done | wc -l) &&
 152         test 0 = $(grep -v "^#" < .git/.dotest-merge/todo | wc -l)
 153 '
 154
 155 test_expect_success 'abort' '
 156         git rebase --abort &&
 157         test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
 158         ! test -d .git/.dotest-merge
 159 '
 160
 161 test_expect_success 'retain authorship' '
 162         echo A > file7 &&
 163         git add file7 &&
 164         test_tick &&
 165         GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
 166         git tag twerp &&
 167         git rebase -i --onto master HEAD^ &&
 168         git show HEAD | grep "^Author: Twerp Snog"
 169 '
 170
 171 test_expect_success 'squash' '
 172         git reset --hard twerp &&
 173         echo B > file7 &&
 174         test_tick &&
 175         GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
 176         echo "******************************" &&
 177         FAKE_LINES="1 squash 2" git rebase -i --onto master HEAD~2 &&
 178         test B = $(cat file7) &&
 179         test $(git rev-parse HEAD^) = $(git rev-parse master)
 180 '
 181
 182 test_expect_success 'retain authorship when squashing' '
 183         git show HEAD | grep "^Author: Nitfol"
 184 '
 185
 186 test_expect_success 'preserve merges with -p' '
 187         git checkout -b to-be-preserved master^ &&
 188         : > unrelated-file &&
 189         git add unrelated-file &&
 190         test_tick &&
 191         git commit -m "unrelated" &&
 192         git checkout -b to-be-rebased master &&
 193         echo B > file1 &&
 194         test_tick &&
 195         git commit -m J file1 &&
 196         test_tick &&
 197         git merge to-be-preserved &&
 198         echo C > file1 &&
 199         test_tick &&
 200         git commit -m K file1 &&
 201         test_tick &&
 202         git rebase -i -p --onto branch1 master &&
 203         test $(git rev-parse HEAD^^2) = $(git rev-parse to-be-preserved) &&
 204         test $(git rev-parse HEAD~3) = $(git rev-parse branch1) &&
 205         test $(git show HEAD:file1) = C &&
 206         test $(git show HEAD~2:file1) = B
 207 '
 208
 209 test_expect_success '--continue tries to commit' '
 210         test_tick &&
 211         ! git rebase -i --onto new-branch1 HEAD^ &&
 212         echo resolved > file1 &&
 213         git add file1 &&
 214         FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
 215         test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&
 216         git show HEAD | grep chouette
 217 '
 218
 219 test_expect_success 'verbose flag is heeded, even after --continue' '
 220         git reset --hard HEAD@{1} &&
 221         test_tick &&
 222         ! git rebase -v -i --onto new-branch1 HEAD^ &&
 223         echo resolved > file1 &&
 224         git add file1 &&
 225         git rebase --continue > output &&
 226         grep "^ file1 |    2 +-$" output
 227 '
 228
 229 test_expect_success 'multi-squash only fires up editor once' '
 230         base=$(git rev-parse HEAD~4) &&
 231         FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \
 232                 git rebase -i $base &&
 233         test $base = $(git rev-parse HEAD^) &&
 234         test 1 = $(git show | grep ONCE | wc -l)
 235 '
 236
 237 test_expect_success 'squash works as expected' '
 238         for n in one two three four
 239         do
 240                 echo $n >> file$n &&
 241                 git add file$n &&
 242                 git commit -m $n
 243         done &&
 244         one=$(git rev-parse HEAD~3) &&
 245         FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
 246         test $one = $(git rev-parse HEAD~2)
 247 '
 248
 249 test_expect_success 'interrupted squash works as expected' '
 250         for n in one two three four
 251         do
 252                 echo $n >> conflict &&
 253                 git add conflict &&
 254                 git commit -m $n
 255         done &&
 256         one=$(git rev-parse HEAD~3) &&
 257         ! FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
 258         (echo one; echo two; echo four) > conflict &&
 259         git add conflict &&
 260         ! git rebase --continue &&
 261         echo resolved > conflict &&
 262         git add conflict &&
 263         git rebase --continue &&
 264         test $one = $(git rev-parse HEAD~2)
 265 '
 266
 267 test_expect_success 'interrupted squash works as expected (case 2)' '
 268         for n in one two three four
 269         do
 270                 echo $n >> conflict &&
 271                 git add conflict &&
 272                 git commit -m $n
 273         done &&
 274         one=$(git rev-parse HEAD~3) &&
 275         ! FAKE_LINES="3 squash 1 2" git rebase -i HEAD~3 &&
 276         (echo one; echo four) > conflict &&
 277         git add conflict &&
 278         ! git rebase --continue &&
 279         (echo one; echo two; echo four) > conflict &&
 280         git add conflict &&
 281         ! git rebase --continue &&
 282         echo resolved > conflict &&
 283         git add conflict &&
 284         git rebase --continue &&
 285         test $one = $(git rev-parse HEAD~2)
 286 '
 287
 288 test_expect_success 'ignore patch if in upstream' '
 289         HEAD=$(git rev-parse HEAD) &&
 290         git checkout -b has-cherry-picked HEAD^ &&
 291         echo unrelated > file7 &&
 292         git add file7 &&
 293         test_tick &&
 294         git commit -m "unrelated change" &&
 295         git cherry-pick $HEAD &&
 296         EXPECT_COUNT=1 git rebase -i $HEAD &&
 297         test $HEAD = $(git rev-parse HEAD^)
 298 '
 299
 300 test_done