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
64echo "#!$SHELL_PATH" >fake-editor.sh
65cat >> fake-editor.sh <<\EOF
66case "$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 ;;
72esac
73test -z "$EXPECT_COUNT" ||
74 test "$EXPECT_COUNT" = $(sed -e '/^#/d' -e '/^$/d' < "$1" | wc -l) ||
75 exit
76test -z "$FAKE_LINES" && exit
77grep -v '^#' < "$1" > "$1".tmp
78rm -f "$1"
79cat "$1".tmp
80action=pick
81for 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
91done
92EOF
93
94test_set_editor "$(pwd)/fake-editor.sh"
95chmod a+x fake-editor.sh
96
97test_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
103test_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
113test_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
121test_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
131test_expect_success 'reflog for the branch shows state before rebase' '
132 test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
133'
134
135test_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
141cat > expect << EOF
142diff --git a/file1 b/file1
143index e69de29..00750ed 100644
144--- a/file1
145+++ b/file1
146@@ -0,0 +1 @@
147+3
148EOF
149
150cat > expect2 << EOF
151<<<<<<< HEAD:file1
1522
153=======
1543
155>>>>>>> b7ca976... G:file1
156EOF
157
158test_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)
168'
169
170test_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
175'
176
177test_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
187test_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
198test_expect_success 'retain authorship when squashing' '
199 git show HEAD | grep "^Author: Twerp Snog"
200'
201
202test_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)
206'
207
208test_expect_success 'preserve merges with -p' '
209 git checkout -b to-be-preserved master^ &&
210 : > unrelated-file &&
211 git add unrelated-file &&
212 test_tick &&
213 git commit -m "unrelated" &&
214 git checkout -b to-be-rebased master &&
215 echo B > file1 &&
216 test_tick &&
217 git commit -m J file1 &&
218 test_tick &&
219 git merge to-be-preserved &&
220 echo C > file1 &&
221 test_tick &&
222 git commit -m K file1 &&
223 test_tick &&
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
229'
230
231test_expect_success '--continue tries to commit' '
232 test_tick &&
233 test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
234 echo resolved > file1 &&
235 git add 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
239'
240
241test_expect_success 'verbose flag is heeded, even after --continue' '
242 git reset --hard HEAD@{1} &&
243 test_tick &&
244 test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
245 echo resolved > file1 &&
246 git add file1 &&
247 git rebase --continue > output &&
248 grep "^ file1 | 2 +-$" output
249'
250
251test_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)
257'
258
259test_expect_success 'squash works as expected' '
260 for n in one two three four
261 do
262 echo $n >> file$n &&
263 git add file$n &&
264 git commit -m $n
265 done &&
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)
269'
270
271test_expect_success 'interrupted squash works as expected' '
272 for n in one two three four
273 do
274 echo $n >> conflict &&
275 git add conflict &&
276 git commit -m $n
277 done &&
278 one=$(git rev-parse HEAD~3) &&
279 (
280 FAKE_LINES="1 squash 3 2" &&
281 export FAKE_LINES &&
282 test_must_fail git rebase -i HEAD~3
283 ) &&
284 (echo one; echo two; echo four) > conflict &&
285 git add conflict &&
286 test_must_fail git rebase --continue &&
287 echo resolved > conflict &&
288 git add conflict &&
289 git rebase --continue &&
290 test $one = $(git rev-parse HEAD~2)
291'
292
293test_expect_success 'interrupted squash works as expected (case 2)' '
294 for n in one two three four
295 do
296 echo $n >> conflict &&
297 git add conflict &&
298 git commit -m $n
299 done &&
300 one=$(git rev-parse HEAD~3) &&
301 (
302 FAKE_LINES="3 squash 1 2" &&
303 export FAKE_LINES &&
304 test_must_fail git rebase -i HEAD~3
305 ) &&
306 (echo one; echo four) > conflict &&
307 git add conflict &&
308 test_must_fail git rebase --continue &&
309 (echo one; echo two; echo four) > conflict &&
310 git add conflict &&
311 test_must_fail git rebase --continue &&
312 echo resolved > conflict &&
313 git add conflict &&
314 git rebase --continue &&
315 test $one = $(git rev-parse HEAD~2)
316'
317
318test_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 &&
322 git add file7 &&
323 test_tick &&
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^)
328'
329
330test_expect_success '--continue tries to commit, even for "edit"' '
331 parent=$(git rev-parse HEAD^) &&
332 test_tick &&
333 FAKE_LINES="edit 1" git rebase -i HEAD^ &&
334 echo edited > file7 &&
335 git add 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^)
340'
341
342test_expect_success 'rebase a detached HEAD' '
343 grandparent=$(git rev-parse HEAD~2) &&
344 git checkout $(git rev-parse HEAD) &&
345 test_tick &&
346 FAKE_LINES="2 1" git rebase -i HEAD~2 &&
347 test $grandparent = $(git rev-parse HEAD~2)
348'
349
350test_expect_success 'rebase a commit violating pre-commit' '
351
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 &&
358 test_tick &&
359 test_must_fail git commit -m doesnt-verify file1 &&
360 git commit -m doesnt-verify --no-verify file1 &&
361 test_tick &&
362 FAKE_LINES=2 git rebase -i HEAD~2
363
364'
365
366test_expect_success 'rebase with a file named HEAD in worktree' '
367
368 rm -fr .git/hooks &&
369 git reset --hard &&
370 git checkout -b branch3 A &&
371
372 (
373 GIT_AUTHOR_NAME="Squashed Away" &&
374 export GIT_AUTHOR_NAME &&
375 >HEAD &&
376 git add HEAD &&
377 git commit -m "Add head" &&
378 >BODY &&
379 git add BODY &&
380 git commit -m "Add body"
381 ) &&
382
383 FAKE_LINES="1 squash 2" git rebase -i to-be-rebased &&
384 test "$(git show -s --pretty=format:%an)" = "Squashed Away"
385
386'
387
388test_done