3 # Copyright (c) 2007 Johannes E. Schindelin
6 test_description
='git rebase interactive
8 This test runs git rebase "interactively", by faking an edit, and verifies
9 that the result still makes sense.
13 # set up two branches like this:
21 # where B, D and G touch the same file.
23 test_expect_success
'setup' '
31 git commit -m B file1 &&
38 git commit -m D file1 &&
43 git checkout -b branch1 A &&
51 git commit -m G file1 &&
56 git checkout -b branch2 F &&
64 echo "#!$SHELL_PATH" >fake-editor.sh
65 cat >> fake-editor.sh
<<\EOF
68 test -z "$FAKE_COMMIT_MESSAGE" ||
echo "$FAKE_COMMIT_MESSAGE" > "$1"
69 test -z "$FAKE_COMMIT_AMEND" ||
echo "$FAKE_COMMIT_AMEND" >> "$1"
73 test -z "$EXPECT_COUNT" ||
74 test "$EXPECT_COUNT" = $
(sed -e '/^#/d' -e '/^$/d' < "$1" |
wc -l) ||
76 test -z "$FAKE_LINES" && exit
77 grep -v '^#' < "$1" > "$1".tmp
81 for line
in $FAKE_LINES; do
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"
94 test_set_editor
"$(pwd)/fake-editor.sh"
95 chmod a
+x fake-editor.sh
97 test_expect_success
'no changes are a nop' '
99 test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
100 test $(git rev-parse I) = $(git rev-parse HEAD)
103 test_expect_success
'test the [branch] option' '
104 git checkout -b dead-end &&
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)
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)
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)
131 test_expect_success
'reflog for the branch shows state before rebase' '
132 test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
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)
142 diff --git a/file1 b/file1
143 index e69de29..00750ed 100644
155 >>>>>>> b7ca976... G:file1
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/.dotest-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/.dotest-merge/done | wc -l) &&
167 test 0 = $(grep -c "^[^#]" < .git/.dotest-merge/git-rebase-todo)
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/.dotest-merge
177 test_expect_success
'retain authorship' '
181 GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
183 git rebase -i --onto master HEAD^ &&
184 git show HEAD | grep "^Author: Twerp Snog"
187 test_expect_success
'squash' '
188 git reset --hard twerp &&
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)
198 test_expect_success
'retain authorship when squashing' '
199 git show HEAD | grep "^Author: Twerp Snog"
202 test_expect_success
'-p handles "no changes" gracefully' '
203 HEAD=$(git rev-parse HEAD) &&
204 git rebase -i -p HEAD^ &&
205 test $HEAD = $(git rev-parse HEAD)
208 test_expect_success
'preserve merges with -p' '
209 git checkout -b to-be-preserved master^ &&
210 : > unrelated-file &&
211 git add unrelated-file &&
213 git commit -m "unrelated" &&
214 git checkout -b to-be-rebased master &&
217 git commit -m J file1 &&
219 git merge to-be-preserved &&
222 git commit -m K file1 &&
224 git rebase -i -p --onto branch1 master &&
225 test $(git rev-parse HEAD^^2) = $(git rev-parse to-be-preserved) &&
226 test $(git rev-parse HEAD~3) = $(git rev-parse branch1) &&
227 test $(git show HEAD:file1) = C &&
228 test $(git show HEAD~2:file1) = B
231 test_expect_success
'--continue tries to commit' '
233 test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
234 echo resolved > file1 &&
236 FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
237 test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&
238 git show HEAD | grep chouette
241 test_expect_success
'verbose flag is heeded, even after --continue' '
242 git reset --hard HEAD@{1} &&
244 test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
245 echo resolved > file1 &&
247 git rebase --continue > output &&
248 grep "^ file1 | 2 +-$" output
251 test_expect_success
'multi-squash only fires up editor once' '
252 base=$(git rev-parse HEAD~4) &&
253 FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \
254 git rebase -i $base &&
255 test $base = $(git rev-parse HEAD^) &&
256 test 1 = $(git show | grep ONCE | wc -l)
259 test_expect_success
'squash works as expected' '
260 for n in one two three four
266 one=$(git rev-parse HEAD~3) &&
267 FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
268 test $one = $(git rev-parse HEAD~2)
271 test_expect_success
'interrupted squash works as expected' '
272 for n in one two three four
274 echo $n >> conflict &&
278 one=$(git rev-parse HEAD~3) &&
280 FAKE_LINES="1 squash 3 2" &&
282 test_must_fail git rebase -i HEAD~3
284 (echo one; echo two; echo four) > conflict &&
286 test_must_fail git rebase --continue &&
287 echo resolved > conflict &&
289 git rebase --continue &&
290 test $one = $(git rev-parse HEAD~2)
293 test_expect_success
'interrupted squash works as expected (case 2)' '
294 for n in one two three four
296 echo $n >> conflict &&
300 one=$(git rev-parse HEAD~3) &&
302 FAKE_LINES="3 squash 1 2" &&
304 test_must_fail git rebase -i HEAD~3
306 (echo one; echo four) > conflict &&
308 test_must_fail git rebase --continue &&
309 (echo one; echo two; echo four) > conflict &&
311 test_must_fail git rebase --continue &&
312 echo resolved > conflict &&
314 git rebase --continue &&
315 test $one = $(git rev-parse HEAD~2)
318 test_expect_success
'ignore patch if in upstream' '
319 HEAD=$(git rev-parse HEAD) &&
320 git checkout -b has-cherry-picked HEAD^ &&
321 echo unrelated > file7 &&
324 git commit -m "unrelated change" &&
325 git cherry-pick $HEAD &&
326 EXPECT_COUNT=1 git rebase -i $HEAD &&
327 test $HEAD = $(git rev-parse HEAD^)
330 test_expect_success
'--continue tries to commit, even for "edit"' '
331 parent=$(git rev-parse HEAD^) &&
333 FAKE_LINES="edit 1" git rebase -i HEAD^ &&
334 echo edited > file7 &&
336 FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
337 test edited = $(git show HEAD:file7) &&
338 git show HEAD | grep chouette &&
339 test $parent = $(git rev-parse HEAD^)
342 test_expect_success
'rebase a detached HEAD' '
343 grandparent=$(git rev-parse HEAD~2) &&
344 git checkout $(git rev-parse HEAD) &&
346 FAKE_LINES="2 1" git rebase -i HEAD~2 &&
347 test $grandparent = $(git rev-parse HEAD~2)
350 test_expect_success
'rebase a commit violating pre-commit' '
352 mkdir -p .git/hooks &&
353 PRE_COMMIT=.git/hooks/pre-commit &&
354 echo "#!/bin/sh" > $PRE_COMMIT &&
355 echo "test -z \"\$(git diff --cached --check)\"" >> $PRE_COMMIT &&
356 chmod a+x $PRE_COMMIT &&
357 echo "monde! " >> file1 &&
359 test_must_fail git commit -m doesnt-verify file1 &&
360 git commit -m doesnt-verify --no-verify file1 &&
362 FAKE_LINES=2 git rebase -i HEAD~2
366 test_expect_success
'rebase with a file named HEAD in worktree' '
370 git checkout -b branch3 A &&
373 GIT_AUTHOR_NAME="Squashed Away" &&
374 export GIT_AUTHOR_NAME &&
377 git commit -m "Add head" &&
380 git commit -m "Add body"
383 FAKE_LINES="1 squash 2" git rebase -i to-be-rebased &&
384 test "$(git show -s --pretty=format:%an)" = "Squashed Away"