3 test_description='pulling into void'
8 sed -e "$1" <"$2" >"$2.x" &&
12 test_pull_autostash () {
13 git reset --hard before-rebase &&
14 echo dirty >new_file &&
16 git pull "$@" . copy &&
17 test_cmp_rev HEAD^ copy &&
18 test "$(cat new_file)" = dirty &&
19 test "$(cat file)" = "modified again"
22 test_pull_autostash_fail () {
23 git reset --hard before-rebase &&
24 echo dirty >new_file &&
26 test_must_fail git pull "$@" . copy 2>err &&
27 test_i18ngrep "uncommitted changes." err
30 test_expect_success setup '
33 git commit -a -m original
36 test_expect_success 'pulling into void' '
43 test -f cloned/file &&
44 test_cmp file cloned/file
47 test_expect_success 'pulling into void using master:master' '
48 git init cloned-uho &&
51 git pull .. master:master
54 test -f cloned-uho/file &&
55 test_cmp file cloned-uho/file
58 test_expect_success 'pulling into void does not overwrite untracked files' '
59 git init cloned-untracked &&
61 cd cloned-untracked &&
62 echo untracked >file &&
63 test_must_fail git pull .. master &&
64 echo untracked >expect &&
69 test_expect_success 'pulling into void does not overwrite staged files' '
70 git init cloned-staged-colliding &&
72 cd cloned-staged-colliding &&
73 echo "alternate content" >file &&
75 test_must_fail git pull .. master &&
76 echo "alternate content" >expect &&
77 test_cmp expect file &&
78 git cat-file blob :file >file.index &&
79 test_cmp expect file.index
83 test_expect_success 'pulling into void does not remove new staged files' '
84 git init cloned-staged-new &&
86 cd cloned-staged-new &&
87 echo "new tracked file" >newfile &&
90 echo "new tracked file" >expect &&
91 test_cmp expect newfile &&
92 git cat-file blob :newfile >newfile.index &&
93 test_cmp expect newfile.index
97 test_expect_success 'pulling into void must not create an octopus' '
98 git init cloned-octopus &&
101 test_must_fail git pull .. master master &&
106 test_expect_success 'test . as a remote' '
107 git branch copy master &&
108 git config branch.copy.remote . &&
109 git config branch.copy.merge refs/heads/master &&
110 echo updated >file &&
111 git commit -a -m updated &&
113 test "$(cat file)" = file &&
115 test "$(cat file)" = updated &&
116 git reflog -1 >reflog.actual &&
117 sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
118 echo "OBJID HEAD@{0}: pull: Fast-forward" >reflog.expected &&
119 test_cmp reflog.expected reflog.fuzzy
122 test_expect_success 'the default remote . should not break explicit pull' '
123 git checkout -b second master^ &&
124 echo modified >file &&
125 git commit -a -m modified &&
127 git reset --hard HEAD^ &&
128 test "$(cat file)" = file &&
130 test "$(cat file)" = modified &&
131 git reflog -1 >reflog.actual &&
132 sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
133 echo "OBJID HEAD@{0}: pull . second: Fast-forward" >reflog.expected &&
134 test_cmp reflog.expected reflog.fuzzy
137 test_expect_success 'fail if wildcard spec does not match any refs' '
138 git checkout -b test copy^ &&
139 test_when_finished "git checkout -f copy && git branch -D test" &&
140 test "$(cat file)" = file &&
141 test_must_fail git pull . "refs/nonexisting1/*:refs/nonexisting2/*" 2>err &&
142 test_i18ngrep "no candidates for merging" err &&
143 test "$(cat file)" = file
146 test_expect_success 'fail if no branches specified with non-default remote' '
147 git remote add test_remote . &&
148 test_when_finished "git remote remove test_remote" &&
149 git checkout -b test copy^ &&
150 test_when_finished "git checkout -f copy && git branch -D test" &&
151 test "$(cat file)" = file &&
152 test_config branch.test.remote origin &&
153 test_must_fail git pull test_remote 2>err &&
154 test_i18ngrep "specify a branch on the command line" err &&
155 test "$(cat file)" = file
158 test_expect_success 'fail if not on a branch' '
159 git remote add origin . &&
160 test_when_finished "git remote remove origin" &&
161 git checkout HEAD^ &&
162 test_when_finished "git checkout -f copy" &&
163 test "$(cat file)" = file &&
164 test_must_fail git pull 2>err &&
165 test_i18ngrep "not currently on a branch" err &&
166 test "$(cat file)" = file
169 test_expect_success 'fail if no configuration for current branch' '
170 git remote add test_remote . &&
171 test_when_finished "git remote remove test_remote" &&
172 git checkout -b test copy^ &&
173 test_when_finished "git checkout -f copy && git branch -D test" &&
174 test_config branch.test.remote test_remote &&
175 test "$(cat file)" = file &&
176 test_must_fail git pull 2>err &&
177 test_i18ngrep "no tracking information" err &&
178 test "$(cat file)" = file
181 test_expect_success 'pull --all: fail if no configuration for current branch' '
182 git remote add test_remote . &&
183 test_when_finished "git remote remove test_remote" &&
184 git checkout -b test copy^ &&
185 test_when_finished "git checkout -f copy && git branch -D test" &&
186 test_config branch.test.remote test_remote &&
187 test "$(cat file)" = file &&
188 test_must_fail git pull --all 2>err &&
189 test_i18ngrep "There is no tracking information" err &&
190 test "$(cat file)" = file
193 test_expect_success 'fail if upstream branch does not exist' '
194 git checkout -b test copy^ &&
195 test_when_finished "git checkout -f copy && git branch -D test" &&
196 test_config branch.test.remote . &&
197 test_config branch.test.merge refs/heads/nonexisting &&
198 test "$(cat file)" = file &&
199 test_must_fail git pull 2>err &&
200 test_i18ngrep "no such ref was fetched" err &&
201 test "$(cat file)" = file
204 test_expect_success 'fail if the index has unresolved entries' '
205 git checkout -b third second^ &&
206 test_when_finished "git checkout -f copy && git branch -D third" &&
207 test "$(cat file)" = file &&
208 test_commit modified2 file &&
209 test -z "$(git ls-files -u)" &&
210 test_must_fail git pull . second &&
211 test -n "$(git ls-files -u)" &&
213 test_must_fail git pull . second 2>err &&
214 test_i18ngrep "Pulling is not possible because you have unmerged files." err &&
215 test_cmp expected file &&
217 test -z "$(git ls-files -u)" &&
218 test_must_fail git pull . second 2>err &&
219 test_i18ngrep "You have not concluded your merge" err &&
220 test_cmp expected file
223 test_expect_success 'fast-forwards working tree if branch head is updated' '
224 git checkout -b third second^ &&
225 test_when_finished "git checkout -f copy && git branch -D third" &&
226 test "$(cat file)" = file &&
227 git pull . second:third 2>err &&
228 test_i18ngrep "fetch updated the current branch head" err &&
229 test "$(cat file)" = modified &&
230 test "$(git rev-parse third)" = "$(git rev-parse second)"
233 test_expect_success 'fast-forward fails with conflicting work tree' '
234 git checkout -b third second^ &&
235 test_when_finished "git checkout -f copy && git branch -D third" &&
236 test "$(cat file)" = file &&
237 echo conflict >file &&
238 test_must_fail git pull . second:third 2>err &&
239 test_i18ngrep "Cannot fast-forward your working tree" err &&
240 test "$(cat file)" = conflict &&
241 test "$(git rev-parse third)" = "$(git rev-parse second)"
244 test_expect_success '--rebase' '
245 git branch to-rebase &&
246 echo modified again > file &&
247 git commit -m file file &&
248 git checkout to-rebase &&
251 git commit -m "new file" &&
252 git tag before-rebase &&
253 git pull --rebase . copy &&
254 test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
255 test new = "$(git show HEAD:file2)"
258 test_expect_success '--rebase fast forward' '
259 git reset --hard before-rebase &&
260 git checkout -b ff &&
261 echo another modification >file &&
262 git commit -m third file &&
264 git checkout to-rebase &&
265 git pull --rebase . ff &&
266 test "$(git rev-parse HEAD)" = "$(git rev-parse ff)" &&
268 # The above only validates the result. Did we actually bypass rebase?
269 git reflog -1 >reflog.actual &&
270 sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
271 echo "OBJID HEAD@{0}: pull --rebase . ff: Fast-forward" >reflog.expected &&
272 test_cmp reflog.expected reflog.fuzzy
275 test_expect_success '--rebase --autostash fast forward' '
278 git checkout to-rebase
279 git branch -D to-rebase-ff
280 git branch -D behind" &&
282 git checkout -b to-rebase-ff &&
283 echo another modification >>file &&
287 git checkout behind &&
289 git pull --rebase --autostash . to-rebase-ff &&
290 test "$(git rev-parse HEAD)" = "$(git rev-parse to-rebase-ff)"
293 test_expect_success '--rebase with conflicts shows advice' '
294 test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
295 git checkout -b seq &&
296 test_seq 5 >seq.txt &&
299 git commit -m "Add seq.txt" &&
302 git commit -m "Append to seq.txt" seq.txt &&
303 git checkout -b with-conflicts HEAD^ &&
304 echo conflicting >>seq.txt &&
306 git commit -m "Create conflict" seq.txt &&
307 test_must_fail git pull --rebase . seq 2>err >out &&
308 test_i18ngrep "Resolve all conflicts manually" out
311 test_expect_success 'failed --rebase shows advice' '
312 test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
313 git checkout -b diverging &&
314 test_commit attributes .gitattributes "* text=auto" attrs &&
315 sha1="$(printf "1\\r\\n" | git hash-object -w --stdin)" &&
316 git update-index --cacheinfo 0644 $sha1 file &&
317 git commit -m v1-with-cr &&
318 # force checkout because `git reset --hard` will not leave clean `file`
319 git checkout -f -b fails-to-rebase HEAD^ &&
320 test_commit v2-without-cr file "2" file2-lf &&
321 test_must_fail git pull --rebase . diverging 2>err >out &&
322 test_i18ngrep "Resolve all conflicts manually" out
325 test_expect_success '--rebase fails with multiple branches' '
326 git reset --hard before-rebase &&
327 test_must_fail git pull --rebase . copy master 2>err &&
328 test "$(git rev-parse HEAD)" = "$(git rev-parse before-rebase)" &&
329 test_i18ngrep "Cannot rebase onto multiple branches" err &&
330 test modified = "$(git show HEAD:file)"
333 test_expect_success 'pull --rebase succeeds with dirty working directory and rebase.autostash set' '
334 test_config rebase.autostash true &&
335 test_pull_autostash --rebase
338 test_expect_success 'pull --rebase --autostash & rebase.autostash=true' '
339 test_config rebase.autostash true &&
340 test_pull_autostash --rebase --autostash
343 test_expect_success 'pull --rebase --autostash & rebase.autostash=false' '
344 test_config rebase.autostash false &&
345 test_pull_autostash --rebase --autostash
348 test_expect_success 'pull --rebase --autostash & rebase.autostash unset' '
349 test_unconfig rebase.autostash &&
350 test_pull_autostash --rebase --autostash
353 test_expect_success 'pull --rebase --no-autostash & rebase.autostash=true' '
354 test_config rebase.autostash true &&
355 test_pull_autostash_fail --rebase --no-autostash
358 test_expect_success 'pull --rebase --no-autostash & rebase.autostash=false' '
359 test_config rebase.autostash false &&
360 test_pull_autostash_fail --rebase --no-autostash
363 test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
364 test_unconfig rebase.autostash &&
365 test_pull_autostash_fail --rebase --no-autostash
368 for i in --autostash --no-autostash
370 test_expect_success "pull $i (without --rebase) is illegal" '
371 test_must_fail git pull $i . copy 2>err &&
372 test_i18ngrep "only valid with --rebase" err
376 test_expect_success 'pull.rebase' '
377 git reset --hard before-rebase &&
378 test_config pull.rebase true &&
380 test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
381 test new = "$(git show HEAD:file2)"
384 test_expect_success 'pull --autostash & pull.rebase=true' '
385 test_config pull.rebase true &&
386 test_pull_autostash --autostash
389 test_expect_success 'pull --no-autostash & pull.rebase=true' '
390 test_config pull.rebase true &&
391 test_pull_autostash_fail --no-autostash
394 test_expect_success 'branch.to-rebase.rebase' '
395 git reset --hard before-rebase &&
396 test_config branch.to-rebase.rebase true &&
398 test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
399 test new = "$(git show HEAD:file2)"
402 test_expect_success 'branch.to-rebase.rebase should override pull.rebase' '
403 git reset --hard before-rebase &&
404 test_config pull.rebase true &&
405 test_config branch.to-rebase.rebase false &&
407 test "$(git rev-parse HEAD^)" != "$(git rev-parse copy)" &&
408 test new = "$(git show HEAD:file2)"
411 test_expect_success "pull --rebase warns on --verify-signatures" '
412 git reset --hard before-rebase &&
413 git pull --rebase --verify-signatures . copy 2>err &&
414 test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
415 test new = "$(git show HEAD:file2)" &&
416 test_i18ngrep "ignoring --verify-signatures for rebase" err
419 test_expect_success "pull --rebase does not warn on --no-verify-signatures" '
420 git reset --hard before-rebase &&
421 git pull --rebase --no-verify-signatures . copy 2>err &&
422 test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
423 test new = "$(git show HEAD:file2)" &&
424 test_i18ngrep ! "verify-signatures" err
427 # add a feature branch, keep-merge, that is merged into master, so the
428 # test can try preserving the merge commit (or not) with various
429 # --rebase flags/pull.rebase settings.
430 test_expect_success 'preserve merge setup' '
431 git reset --hard before-rebase &&
432 git checkout -b keep-merge second^ &&
434 git checkout to-rebase &&
435 git merge keep-merge &&
436 git tag before-preserve-rebase
439 test_expect_success 'pull.rebase=false create a new merge commit' '
440 git reset --hard before-preserve-rebase &&
441 test_config pull.rebase false &&
443 test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
444 test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
445 test file3 = "$(git show HEAD:file3.t)"
448 test_expect_success 'pull.rebase=true flattens keep-merge' '
449 git reset --hard before-preserve-rebase &&
450 test_config pull.rebase true &&
452 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
453 test file3 = "$(git show HEAD:file3.t)"
456 test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' '
457 git reset --hard before-preserve-rebase &&
458 test_config pull.rebase 1 &&
460 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
461 test file3 = "$(git show HEAD:file3.t)"
464 test_expect_success REBASE_P \
465 'pull.rebase=preserve rebases and merges keep-merge' '
466 git reset --hard before-preserve-rebase &&
467 test_config pull.rebase preserve &&
469 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
470 test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
473 test_expect_success 'pull.rebase=interactive' '
474 write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
475 echo I was here >fake.out &&
478 test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
479 test_when_finished "test_might_fail git rebase --abort" &&
480 test_must_fail git pull --rebase=interactive . copy &&
481 test "I was here" = "$(cat fake.out)"
484 test_expect_success 'pull --rebase=i' '
485 write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
486 echo I was here, too >fake.out &&
489 test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
490 test_when_finished "test_might_fail git rebase --abort" &&
491 test_must_fail git pull --rebase=i . copy &&
492 test "I was here, too" = "$(cat fake.out)"
495 test_expect_success 'pull.rebase=invalid fails' '
496 git reset --hard before-preserve-rebase &&
497 test_config pull.rebase invalid &&
501 test_expect_success '--rebase=false create a new merge commit' '
502 git reset --hard before-preserve-rebase &&
503 test_config pull.rebase true &&
504 git pull --rebase=false . copy &&
505 test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
506 test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
507 test file3 = "$(git show HEAD:file3.t)"
510 test_expect_success '--rebase=true rebases and flattens keep-merge' '
511 git reset --hard before-preserve-rebase &&
512 test_config pull.rebase preserve &&
513 git pull --rebase=true . copy &&
514 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
515 test file3 = "$(git show HEAD:file3.t)"
518 test_expect_success REBASE_P \
519 '--rebase=preserve rebases and merges keep-merge' '
520 git reset --hard before-preserve-rebase &&
521 test_config pull.rebase true &&
522 git pull --rebase=preserve . copy &&
523 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
524 test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
527 test_expect_success '--rebase=invalid fails' '
528 git reset --hard before-preserve-rebase &&
529 ! git pull --rebase=invalid . copy
532 test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '
533 git reset --hard before-preserve-rebase &&
534 test_config pull.rebase preserve &&
535 git pull --rebase . copy &&
536 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
537 test file3 = "$(git show HEAD:file3.t)"
540 test_expect_success '--rebase with rebased upstream' '
542 git remote add -f me . &&
545 git reset --hard HEAD^ &&
546 echo conflicting modification > file &&
547 git commit -m conflict file &&
548 git checkout to-rebase &&
550 git commit -m to-rebase file2 &&
551 git tag to-rebase-orig &&
552 git pull --rebase me copy &&
553 test "conflicting modification" = "$(cat file)" &&
554 test file = "$(cat file2)"
558 test_expect_success '--rebase -f with rebased upstream' '
559 test_when_finished "test_might_fail git rebase --abort" &&
560 git reset --hard to-rebase-orig &&
561 git pull --rebase -f me copy &&
562 test "conflicting modification" = "$(cat file)" &&
563 test file = "$(cat file2)"
566 test_expect_success '--rebase with rebased default upstream' '
568 git update-ref refs/remotes/me/copy copy-orig &&
569 git checkout --track -b to-rebase2 me/copy &&
570 git reset --hard to-rebase-orig &&
572 test "conflicting modification" = "$(cat file)" &&
573 test file = "$(cat file2)"
577 test_expect_success 'rebased upstream + fetch + pull --rebase' '
579 git update-ref refs/remotes/me/copy copy-orig &&
580 git reset --hard to-rebase-orig &&
581 git checkout --track -b to-rebase3 me/copy &&
582 git reset --hard to-rebase-orig &&
585 test "conflicting modification" = "$(cat file)" &&
586 test file = "$(cat file2)"
590 test_expect_success 'pull --rebase dies early with dirty working directory' '
592 git checkout to-rebase &&
593 git update-ref refs/remotes/me/copy copy^ &&
594 COPY="$(git rev-parse --verify me/copy)" &&
595 git rebase --onto $COPY copy &&
596 test_config branch.to-rebase.remote me &&
597 test_config branch.to-rebase.merge refs/heads/copy &&
598 test_config branch.to-rebase.rebase true &&
599 echo dirty >> file &&
601 test_must_fail git pull &&
602 test "$COPY" = "$(git rev-parse --verify me/copy)" &&
603 git checkout HEAD -- file &&
605 test "$COPY" != "$(git rev-parse --verify me/copy)"
609 test_expect_success 'pull --rebase works on branch yet to be born' '
610 git rev-parse master >expect &&
614 git pull --rebase .. master &&
615 git rev-parse HEAD >../actual
617 test_cmp expect actual
620 test_expect_success 'pull --rebase fails on unborn branch with staged changes' '
621 test_when_finished "rm -rf empty_repo2" &&
622 git init empty_repo2 &&
625 echo staged-file >staged-file &&
626 git add staged-file &&
627 test "$(git ls-files)" = staged-file &&
628 test_must_fail git pull --rebase .. master 2>err &&
629 test "$(git ls-files)" = staged-file &&
630 test "$(git show :staged-file)" = staged-file &&
631 test_i18ngrep "unborn branch with changes added to the index" err
635 test_expect_success 'pull --rebase fails on corrupt HEAD' '
636 test_when_finished "rm -rf corrupt" &&
641 obj=$(git rev-parse --verify HEAD | sed "s#^..#&/#") &&
642 rm -f .git/objects/$obj &&
643 test_must_fail git pull --rebase
647 test_expect_success 'setup for detecting upstreamed changes' '
651 printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" > stuff &&
653 git commit -m "Initial revision"
657 modify s/5/43/ stuff &&
658 git commit -a -m "5->43" &&
659 modify s/6/42/ stuff &&
660 git commit -a -m "Make it bigger"
663 modify s/5/43/ stuff &&
664 git commit -a -m "Independent discovery of 5->43"
668 test_expect_success 'git pull --rebase detects upstreamed changes' '
671 test -z "$(git ls-files -u)"
675 test_expect_success 'setup for avoiding reapplying old patches' '
677 test_might_fail git rebase --abort &&
678 git reset --hard origin/master
680 git clone --bare src src-replace.git &&
682 mv src-replace.git src &&
684 modify s/2/22/ stuff &&
685 git commit -a -m "Change 2" &&
686 modify s/3/33/ stuff &&
687 git commit -a -m "Change 3" &&
688 modify s/4/44/ stuff &&
689 git commit -a -m "Change 4" &&
692 modify s/44/55/ stuff &&
693 git commit --amend -a -m "Modified Change 4"
697 test_expect_success 'git pull --rebase does not reapply old patches' '
699 test_must_fail git pull --rebase &&
700 test 1 = $(find .git/rebase-apply -name "000*" | wc -l)
704 test_expect_success 'git pull --rebase against local branch' '
705 git checkout -b copy2 to-rebase-orig &&
706 git pull --rebase . to-rebase &&
707 test "conflicting modification" = "$(cat file)" &&
708 test file = "$(cat file2)"