pull: allow interactive rebase with --rebase=interactive
[git/git.git] / t / t5520-pull.sh
1 #!/bin/sh
2
3 test_description='pulling into void'
4
5 . ./test-lib.sh
6
7 modify () {
8 sed -e "$1" <"$2" >"$2.x" &&
9 mv "$2.x" "$2"
10 }
11
12 test_expect_success setup '
13 echo file >file &&
14 git add file &&
15 git commit -a -m original
16 '
17
18 test_expect_success 'pulling into void' '
19 git init cloned &&
20 (
21 cd cloned &&
22 git pull ..
23 ) &&
24 test -f file &&
25 test -f cloned/file &&
26 test_cmp file cloned/file
27 '
28
29 test_expect_success 'pulling into void using master:master' '
30 git init cloned-uho &&
31 (
32 cd cloned-uho &&
33 git pull .. master:master
34 ) &&
35 test -f file &&
36 test -f cloned-uho/file &&
37 test_cmp file cloned-uho/file
38 '
39
40 test_expect_success 'pulling into void does not overwrite untracked files' '
41 git init cloned-untracked &&
42 (
43 cd cloned-untracked &&
44 echo untracked >file &&
45 test_must_fail git pull .. master &&
46 echo untracked >expect &&
47 test_cmp expect file
48 )
49 '
50
51 test_expect_success 'pulling into void does not overwrite staged files' '
52 git init cloned-staged-colliding &&
53 (
54 cd cloned-staged-colliding &&
55 echo "alternate content" >file &&
56 git add file &&
57 test_must_fail git pull .. master &&
58 echo "alternate content" >expect &&
59 test_cmp expect file &&
60 git cat-file blob :file >file.index &&
61 test_cmp expect file.index
62 )
63 '
64
65 test_expect_success 'pulling into void does not remove new staged files' '
66 git init cloned-staged-new &&
67 (
68 cd cloned-staged-new &&
69 echo "new tracked file" >newfile &&
70 git add newfile &&
71 git pull .. master &&
72 echo "new tracked file" >expect &&
73 test_cmp expect newfile &&
74 git cat-file blob :newfile >newfile.index &&
75 test_cmp expect newfile.index
76 )
77 '
78
79 test_expect_success 'pulling into void must not create an octopus' '
80 git init cloned-octopus &&
81 (
82 cd cloned-octopus &&
83 test_must_fail git pull .. master master &&
84 ! test -f file
85 )
86 '
87
88 test_expect_success 'test . as a remote' '
89 git branch copy master &&
90 git config branch.copy.remote . &&
91 git config branch.copy.merge refs/heads/master &&
92 echo updated >file &&
93 git commit -a -m updated &&
94 git checkout copy &&
95 test "$(cat file)" = file &&
96 git pull &&
97 test "$(cat file)" = updated &&
98 git reflog -1 >reflog.actual &&
99 sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
100 echo "OBJID HEAD@{0}: pull: Fast-forward" >reflog.expected &&
101 test_cmp reflog.expected reflog.fuzzy
102 '
103
104 test_expect_success 'the default remote . should not break explicit pull' '
105 git checkout -b second master^ &&
106 echo modified >file &&
107 git commit -a -m modified &&
108 git checkout copy &&
109 git reset --hard HEAD^ &&
110 test "$(cat file)" = file &&
111 git pull . second &&
112 test "$(cat file)" = modified &&
113 git reflog -1 >reflog.actual &&
114 sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
115 echo "OBJID HEAD@{0}: pull . second: Fast-forward" >reflog.expected &&
116 test_cmp reflog.expected reflog.fuzzy
117 '
118
119 test_expect_success 'fail if wildcard spec does not match any refs' '
120 git checkout -b test copy^ &&
121 test_when_finished "git checkout -f copy && git branch -D test" &&
122 test "$(cat file)" = file &&
123 test_must_fail git pull . "refs/nonexisting1/*:refs/nonexisting2/*" 2>err &&
124 test_i18ngrep "no candidates for merging" err &&
125 test "$(cat file)" = file
126 '
127
128 test_expect_success 'fail if no branches specified with non-default remote' '
129 git remote add test_remote . &&
130 test_when_finished "git remote remove test_remote" &&
131 git checkout -b test copy^ &&
132 test_when_finished "git checkout -f copy && git branch -D test" &&
133 test "$(cat file)" = file &&
134 test_config branch.test.remote origin &&
135 test_must_fail git pull test_remote 2>err &&
136 test_i18ngrep "specify a branch on the command line" err &&
137 test "$(cat file)" = file
138 '
139
140 test_expect_success 'fail if not on a branch' '
141 git remote add origin . &&
142 test_when_finished "git remote remove origin" &&
143 git checkout HEAD^ &&
144 test_when_finished "git checkout -f copy" &&
145 test "$(cat file)" = file &&
146 test_must_fail git pull 2>err &&
147 test_i18ngrep "not currently on a branch" err &&
148 test "$(cat file)" = file
149 '
150
151 test_expect_success 'fail if no configuration for current branch' '
152 git remote add test_remote . &&
153 test_when_finished "git remote remove test_remote" &&
154 git checkout -b test copy^ &&
155 test_when_finished "git checkout -f copy && git branch -D test" &&
156 test_config branch.test.remote test_remote &&
157 test "$(cat file)" = file &&
158 test_must_fail git pull 2>err &&
159 test_i18ngrep "no tracking information" err &&
160 test "$(cat file)" = file
161 '
162
163 test_expect_success 'pull --all: fail if no configuration for current branch' '
164 git remote add test_remote . &&
165 test_when_finished "git remote remove test_remote" &&
166 git checkout -b test copy^ &&
167 test_when_finished "git checkout -f copy && git branch -D test" &&
168 test_config branch.test.remote test_remote &&
169 test "$(cat file)" = file &&
170 test_must_fail git pull --all 2>err &&
171 test_i18ngrep "There is no tracking information" err &&
172 test "$(cat file)" = file
173 '
174
175 test_expect_success 'fail if upstream branch does not exist' '
176 git checkout -b test copy^ &&
177 test_when_finished "git checkout -f copy && git branch -D test" &&
178 test_config branch.test.remote . &&
179 test_config branch.test.merge refs/heads/nonexisting &&
180 test "$(cat file)" = file &&
181 test_must_fail git pull 2>err &&
182 test_i18ngrep "no such ref was fetched" err &&
183 test "$(cat file)" = file
184 '
185
186 test_expect_success 'fail if the index has unresolved entries' '
187 git checkout -b third second^ &&
188 test_when_finished "git checkout -f copy && git branch -D third" &&
189 test "$(cat file)" = file &&
190 test_commit modified2 file &&
191 test -z "$(git ls-files -u)" &&
192 test_must_fail git pull . second &&
193 test -n "$(git ls-files -u)" &&
194 cp file expected &&
195 test_must_fail git pull . second 2>err &&
196 test_i18ngrep "Pull is not possible because you have unmerged files" err &&
197 test_cmp expected file &&
198 git add file &&
199 test -z "$(git ls-files -u)" &&
200 test_must_fail git pull . second 2>err &&
201 test_i18ngrep "You have not concluded your merge" err &&
202 test_cmp expected file
203 '
204
205 test_expect_success 'fast-forwards working tree if branch head is updated' '
206 git checkout -b third second^ &&
207 test_when_finished "git checkout -f copy && git branch -D third" &&
208 test "$(cat file)" = file &&
209 git pull . second:third 2>err &&
210 test_i18ngrep "fetch updated the current branch head" err &&
211 test "$(cat file)" = modified &&
212 test "$(git rev-parse third)" = "$(git rev-parse second)"
213 '
214
215 test_expect_success 'fast-forward fails with conflicting work tree' '
216 git checkout -b third second^ &&
217 test_when_finished "git checkout -f copy && git branch -D third" &&
218 test "$(cat file)" = file &&
219 echo conflict >file &&
220 test_must_fail git pull . second:third 2>err &&
221 test_i18ngrep "Cannot fast-forward your working tree" err &&
222 test "$(cat file)" = conflict &&
223 test "$(git rev-parse third)" = "$(git rev-parse second)"
224 '
225
226 test_expect_success '--rebase' '
227 git branch to-rebase &&
228 echo modified again > file &&
229 git commit -m file file &&
230 git checkout to-rebase &&
231 echo new > file2 &&
232 git add file2 &&
233 git commit -m "new file" &&
234 git tag before-rebase &&
235 git pull --rebase . copy &&
236 test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
237 test new = "$(git show HEAD:file2)"
238 '
239
240 test_expect_success '--rebase fails with multiple branches' '
241 git reset --hard before-rebase &&
242 test_must_fail git pull --rebase . copy master 2>err &&
243 test "$(git rev-parse HEAD)" = "$(git rev-parse before-rebase)" &&
244 test_i18ngrep "Cannot rebase onto multiple branches" err &&
245 test modified = "$(git show HEAD:file)"
246 '
247
248 test_expect_success 'pull --rebase succeeds with dirty working directory and rebase.autostash set' '
249 test_config rebase.autostash true &&
250 git reset --hard before-rebase &&
251 echo dirty >new_file &&
252 git add new_file &&
253 git pull --rebase . copy &&
254 test_cmp_rev HEAD^ copy &&
255 test "$(cat new_file)" = dirty &&
256 test "$(cat file)" = "modified again"
257 '
258
259 test_expect_success 'pull.rebase' '
260 git reset --hard before-rebase &&
261 test_config pull.rebase true &&
262 git pull . copy &&
263 test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
264 test new = "$(git show HEAD:file2)"
265 '
266
267 test_expect_success 'branch.to-rebase.rebase' '
268 git reset --hard before-rebase &&
269 test_config branch.to-rebase.rebase true &&
270 git pull . copy &&
271 test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
272 test new = "$(git show HEAD:file2)"
273 '
274
275 test_expect_success 'branch.to-rebase.rebase should override pull.rebase' '
276 git reset --hard before-rebase &&
277 test_config pull.rebase true &&
278 test_config branch.to-rebase.rebase false &&
279 git pull . copy &&
280 test "$(git rev-parse HEAD^)" != "$(git rev-parse copy)" &&
281 test new = "$(git show HEAD:file2)"
282 '
283
284 # add a feature branch, keep-merge, that is merged into master, so the
285 # test can try preserving the merge commit (or not) with various
286 # --rebase flags/pull.rebase settings.
287 test_expect_success 'preserve merge setup' '
288 git reset --hard before-rebase &&
289 git checkout -b keep-merge second^ &&
290 test_commit file3 &&
291 git checkout to-rebase &&
292 git merge keep-merge &&
293 git tag before-preserve-rebase
294 '
295
296 test_expect_success 'pull.rebase=false create a new merge commit' '
297 git reset --hard before-preserve-rebase &&
298 test_config pull.rebase false &&
299 git pull . copy &&
300 test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
301 test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
302 test file3 = "$(git show HEAD:file3.t)"
303 '
304
305 test_expect_success 'pull.rebase=true flattens keep-merge' '
306 git reset --hard before-preserve-rebase &&
307 test_config pull.rebase true &&
308 git pull . copy &&
309 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
310 test file3 = "$(git show HEAD:file3.t)"
311 '
312
313 test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' '
314 git reset --hard before-preserve-rebase &&
315 test_config pull.rebase 1 &&
316 git pull . copy &&
317 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
318 test file3 = "$(git show HEAD:file3.t)"
319 '
320
321 test_expect_success 'pull.rebase=preserve rebases and merges keep-merge' '
322 git reset --hard before-preserve-rebase &&
323 test_config pull.rebase preserve &&
324 git pull . copy &&
325 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
326 test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
327 '
328
329 test_expect_success 'pull.rebase=interactive' '
330 write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
331 echo I was here >fake.out &&
332 false
333 EOF
334 test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
335 test_must_fail git pull --rebase=interactive . copy &&
336 test "I was here" = "$(cat fake.out)"
337 '
338
339 test_expect_success 'pull.rebase=invalid fails' '
340 git reset --hard before-preserve-rebase &&
341 test_config pull.rebase invalid &&
342 ! git pull . copy
343 '
344
345 test_expect_success '--rebase=false create a new merge commit' '
346 git reset --hard before-preserve-rebase &&
347 test_config pull.rebase true &&
348 git pull --rebase=false . copy &&
349 test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
350 test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
351 test file3 = "$(git show HEAD:file3.t)"
352 '
353
354 test_expect_success '--rebase=true rebases and flattens keep-merge' '
355 git reset --hard before-preserve-rebase &&
356 test_config pull.rebase preserve &&
357 git pull --rebase=true . copy &&
358 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
359 test file3 = "$(git show HEAD:file3.t)"
360 '
361
362 test_expect_success '--rebase=preserve rebases and merges keep-merge' '
363 git reset --hard before-preserve-rebase &&
364 test_config pull.rebase true &&
365 git pull --rebase=preserve . copy &&
366 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
367 test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
368 '
369
370 test_expect_success '--rebase=invalid fails' '
371 git reset --hard before-preserve-rebase &&
372 ! git pull --rebase=invalid . copy
373 '
374
375 test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '
376 git reset --hard before-preserve-rebase &&
377 test_config pull.rebase preserve &&
378 git pull --rebase . copy &&
379 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
380 test file3 = "$(git show HEAD:file3.t)"
381 '
382
383 test_expect_success '--rebase with rebased upstream' '
384
385 git remote add -f me . &&
386 git checkout copy &&
387 git tag copy-orig &&
388 git reset --hard HEAD^ &&
389 echo conflicting modification > file &&
390 git commit -m conflict file &&
391 git checkout to-rebase &&
392 echo file > file2 &&
393 git commit -m to-rebase file2 &&
394 git tag to-rebase-orig &&
395 git pull --rebase me copy &&
396 test "conflicting modification" = "$(cat file)" &&
397 test file = "$(cat file2)"
398
399 '
400
401 test_expect_success '--rebase -f with rebased upstream' '
402 test_when_finished "test_might_fail git rebase --abort" &&
403 git reset --hard to-rebase-orig &&
404 git pull --rebase -f me copy &&
405 test "conflicting modification" = "$(cat file)" &&
406 test file = "$(cat file2)"
407 '
408
409 test_expect_success '--rebase with rebased default upstream' '
410
411 git update-ref refs/remotes/me/copy copy-orig &&
412 git checkout --track -b to-rebase2 me/copy &&
413 git reset --hard to-rebase-orig &&
414 git pull --rebase &&
415 test "conflicting modification" = "$(cat file)" &&
416 test file = "$(cat file2)"
417
418 '
419
420 test_expect_success 'rebased upstream + fetch + pull --rebase' '
421
422 git update-ref refs/remotes/me/copy copy-orig &&
423 git reset --hard to-rebase-orig &&
424 git checkout --track -b to-rebase3 me/copy &&
425 git reset --hard to-rebase-orig &&
426 git fetch &&
427 git pull --rebase &&
428 test "conflicting modification" = "$(cat file)" &&
429 test file = "$(cat file2)"
430
431 '
432
433 test_expect_success 'pull --rebase dies early with dirty working directory' '
434
435 git checkout to-rebase &&
436 git update-ref refs/remotes/me/copy copy^ &&
437 COPY="$(git rev-parse --verify me/copy)" &&
438 git rebase --onto $COPY copy &&
439 test_config branch.to-rebase.remote me &&
440 test_config branch.to-rebase.merge refs/heads/copy &&
441 test_config branch.to-rebase.rebase true &&
442 echo dirty >> file &&
443 git add file &&
444 test_must_fail git pull &&
445 test "$COPY" = "$(git rev-parse --verify me/copy)" &&
446 git checkout HEAD -- file &&
447 git pull &&
448 test "$COPY" != "$(git rev-parse --verify me/copy)"
449
450 '
451
452 test_expect_success 'pull --rebase works on branch yet to be born' '
453 git rev-parse master >expect &&
454 mkdir empty_repo &&
455 (cd empty_repo &&
456 git init &&
457 git pull --rebase .. master &&
458 git rev-parse HEAD >../actual
459 ) &&
460 test_cmp expect actual
461 '
462
463 test_expect_success 'pull --rebase fails on unborn branch with staged changes' '
464 test_when_finished "rm -rf empty_repo2" &&
465 git init empty_repo2 &&
466 (
467 cd empty_repo2 &&
468 echo staged-file >staged-file &&
469 git add staged-file &&
470 test "$(git ls-files)" = staged-file &&
471 test_must_fail git pull --rebase .. master 2>err &&
472 test "$(git ls-files)" = staged-file &&
473 test "$(git show :staged-file)" = staged-file &&
474 test_i18ngrep "unborn branch with changes added to the index" err
475 )
476 '
477
478 test_expect_success 'setup for detecting upstreamed changes' '
479 mkdir src &&
480 (cd src &&
481 git init &&
482 printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" > stuff &&
483 git add stuff &&
484 git commit -m "Initial revision"
485 ) &&
486 git clone src dst &&
487 (cd src &&
488 modify s/5/43/ stuff &&
489 git commit -a -m "5->43" &&
490 modify s/6/42/ stuff &&
491 git commit -a -m "Make it bigger"
492 ) &&
493 (cd dst &&
494 modify s/5/43/ stuff &&
495 git commit -a -m "Independent discovery of 5->43"
496 )
497 '
498
499 test_expect_success 'git pull --rebase detects upstreamed changes' '
500 (cd dst &&
501 git pull --rebase &&
502 test -z "$(git ls-files -u)"
503 )
504 '
505
506 test_expect_success 'setup for avoiding reapplying old patches' '
507 (cd dst &&
508 test_might_fail git rebase --abort &&
509 git reset --hard origin/master
510 ) &&
511 git clone --bare src src-replace.git &&
512 rm -rf src &&
513 mv src-replace.git src &&
514 (cd dst &&
515 modify s/2/22/ stuff &&
516 git commit -a -m "Change 2" &&
517 modify s/3/33/ stuff &&
518 git commit -a -m "Change 3" &&
519 modify s/4/44/ stuff &&
520 git commit -a -m "Change 4" &&
521 git push &&
522
523 modify s/44/55/ stuff &&
524 git commit --amend -a -m "Modified Change 4"
525 )
526 '
527
528 test_expect_success 'git pull --rebase does not reapply old patches' '
529 (cd dst &&
530 test_must_fail git pull --rebase &&
531 test 1 = $(find .git/rebase-apply -name "000*" | wc -l)
532 )
533 '
534
535 test_expect_success 'git pull --rebase against local branch' '
536 git checkout -b copy2 to-rebase-orig &&
537 git pull --rebase . to-rebase &&
538 test "conflicting modification" = "$(cat file)" &&
539 test file = "$(cat file2)"
540 '
541
542 test_done