3 test_description='pulling into void'
5 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
6 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
11 sed -e "$1" "$2" >"$2.x" &&
15 test_pull_autostash () {
16 expect_parent_num="$1" &&
18 git reset --hard before-rebase &&
19 echo dirty >new_file &&
21 git pull "$@" . copy &&
22 test_cmp_rev HEAD^"$expect_parent_num" copy &&
24 test_cmp expect new_file &&
25 echo "modified again" >expect &&
29 test_pull_autostash_fail () {
30 git reset --hard before-rebase &&
31 echo dirty >new_file &&
33 test_must_fail git pull "$@" . copy 2>err &&
34 test_i18ngrep -E "uncommitted changes.|overwritten by merge:" err
37 test_expect_success setup '
40 git commit -a -m original
43 test_expect_success 'pulling into void' '
49 test_path_is_file file &&
50 test_path_is_file cloned/file &&
51 test_cmp file cloned/file
54 test_expect_success 'pulling into void using main:main' '
55 git init cloned-uho &&
60 test_path_is_file file &&
61 test_path_is_file cloned-uho/file &&
62 test_cmp file cloned-uho/file
65 test_expect_success 'pulling into void does not overwrite untracked files' '
66 git init cloned-untracked &&
68 cd cloned-untracked &&
69 echo untracked >file &&
70 test_must_fail git pull .. main &&
71 echo untracked >expect &&
76 test_expect_success 'pulling into void does not overwrite staged files' '
77 git init cloned-staged-colliding &&
79 cd cloned-staged-colliding &&
80 echo "alternate content" >file &&
82 test_must_fail git pull .. main &&
83 echo "alternate content" >expect &&
84 test_cmp expect file &&
85 git cat-file blob :file >file.index &&
86 test_cmp expect file.index
90 test_expect_success 'pulling into void does not remove new staged files' '
91 git init cloned-staged-new &&
93 cd cloned-staged-new &&
94 echo "new tracked file" >newfile &&
97 echo "new tracked file" >expect &&
98 test_cmp expect newfile &&
99 git cat-file blob :newfile >newfile.index &&
100 test_cmp expect newfile.index
104 test_expect_success 'pulling into void must not create an octopus' '
105 git init cloned-octopus &&
108 test_must_fail git pull .. main main &&
109 test_path_is_missing file
113 test_expect_success 'test . as a remote' '
114 git branch copy main &&
115 git config branch.copy.remote . &&
116 git config branch.copy.merge refs/heads/main &&
117 echo updated >file &&
118 git commit -a -m updated &&
121 test_cmp expect file &&
123 echo updated >expect &&
124 test_cmp expect file &&
125 git reflog -1 >reflog.actual &&
126 sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
127 echo "OBJID HEAD@{0}: pull: Fast-forward" >reflog.expected &&
128 test_cmp reflog.expected reflog.fuzzy
131 test_expect_success 'the default remote . should not break explicit pull' '
132 git checkout -b second main^ &&
133 echo modified >file &&
134 git commit -a -m modified &&
136 git reset --hard HEAD^ &&
138 test_cmp expect file &&
140 echo modified >expect &&
141 test_cmp expect file &&
142 git reflog -1 >reflog.actual &&
143 sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
144 echo "OBJID HEAD@{0}: pull . second: Fast-forward" >reflog.expected &&
145 test_cmp reflog.expected reflog.fuzzy
148 test_expect_success 'fail if wildcard spec does not match any refs' '
149 git checkout -b test copy^ &&
150 test_when_finished "git checkout -f copy && git branch -D test" &&
152 test_cmp expect file &&
153 test_must_fail git pull . "refs/nonexisting1/*:refs/nonexisting2/*" 2>err &&
154 test_i18ngrep "no candidates for merging" err &&
158 test_expect_success 'fail if no branches specified with non-default remote' '
159 git remote add test_remote . &&
160 test_when_finished "git remote remove test_remote" &&
161 git checkout -b test copy^ &&
162 test_when_finished "git checkout -f copy && git branch -D test" &&
164 test_cmp expect file &&
165 test_config branch.test.remote origin &&
166 test_must_fail git pull test_remote 2>err &&
167 test_i18ngrep "specify a branch on the command line" err &&
171 test_expect_success 'fail if not on a branch' '
172 git remote add origin . &&
173 test_when_finished "git remote remove origin" &&
174 git checkout HEAD^ &&
175 test_when_finished "git checkout -f copy" &&
177 test_cmp expect file &&
178 test_must_fail git pull 2>err &&
179 test_i18ngrep "not currently on a branch" err &&
183 test_expect_success 'fail if no configuration for current branch' '
184 git remote add test_remote . &&
185 test_when_finished "git remote remove test_remote" &&
186 git checkout -b test copy^ &&
187 test_when_finished "git checkout -f copy && git branch -D test" &&
188 test_config branch.test.remote test_remote &&
190 test_cmp expect file &&
191 test_must_fail git pull 2>err &&
192 test_i18ngrep "no tracking information" err &&
196 test_expect_success 'pull --all: fail if no configuration for current branch' '
197 git remote add test_remote . &&
198 test_when_finished "git remote remove test_remote" &&
199 git checkout -b test copy^ &&
200 test_when_finished "git checkout -f copy && git branch -D test" &&
201 test_config branch.test.remote test_remote &&
203 test_cmp expect file &&
204 test_must_fail git pull --all 2>err &&
205 test_i18ngrep "There is no tracking information" err &&
209 test_expect_success 'fail if upstream branch does not exist' '
210 git checkout -b test copy^ &&
211 test_when_finished "git checkout -f copy && git branch -D test" &&
212 test_config branch.test.remote . &&
213 test_config branch.test.merge refs/heads/nonexisting &&
215 test_cmp expect file &&
216 test_must_fail git pull 2>err &&
217 test_i18ngrep "no such ref was fetched" err &&
221 test_expect_success 'fail if the index has unresolved entries' '
222 git checkout -b third second^ &&
223 test_when_finished "git checkout -f copy && git branch -D third" &&
225 test_cmp expect file &&
226 test_commit modified2 file &&
227 git ls-files -u >unmerged &&
228 test_must_be_empty unmerged &&
229 test_must_fail git pull . second &&
230 git ls-files -u >unmerged &&
231 test_file_not_empty unmerged &&
233 test_must_fail git pull . second 2>err &&
234 test_i18ngrep "Pulling is not possible because you have unmerged files." err &&
235 test_cmp expected file &&
237 git ls-files -u >unmerged &&
238 test_must_be_empty unmerged &&
239 test_must_fail git pull . second 2>err &&
240 test_i18ngrep "You have not concluded your merge" err &&
241 test_cmp expected file
244 test_expect_success 'fast-forwards working tree if branch head is updated' '
245 git checkout -b third second^ &&
246 test_when_finished "git checkout -f copy && git branch -D third" &&
248 test_cmp expect file &&
249 git pull . second:third 2>err &&
250 test_i18ngrep "fetch updated the current branch head" err &&
251 echo modified >expect &&
252 test_cmp expect file &&
253 test_cmp_rev third second
256 test_expect_success 'fast-forward fails with conflicting work tree' '
257 git checkout -b third second^ &&
258 test_when_finished "git checkout -f copy && git branch -D third" &&
260 test_cmp expect file &&
261 echo conflict >file &&
262 test_must_fail git pull . second:third 2>err &&
263 test_i18ngrep "Cannot fast-forward your working tree" err &&
264 echo conflict >expect &&
265 test_cmp expect file &&
266 test_cmp_rev third second
269 test_expect_success '--rebase' '
270 git branch to-rebase &&
271 echo modified again >file &&
272 git commit -m file file &&
273 git checkout to-rebase &&
276 git commit -m "new file" &&
277 git tag before-rebase &&
278 git pull --rebase . copy &&
279 test_cmp_rev HEAD^ copy &&
281 git show HEAD:file2 >actual &&
282 test_cmp expect actual
285 test_expect_success '--rebase (merge) fast forward' '
286 git reset --hard before-rebase &&
287 git checkout -b ff &&
288 echo another modification >file &&
289 git commit -m third file &&
291 git checkout to-rebase &&
292 git -c rebase.backend=merge pull --rebase . ff &&
293 test_cmp_rev HEAD ff &&
295 # The above only validates the result. Did we actually bypass rebase?
296 git reflog -1 >reflog.actual &&
297 sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
298 echo "OBJID HEAD@{0}: pull --rebase . ff: Fast-forward" >reflog.expected &&
299 test_cmp reflog.expected reflog.fuzzy
302 test_expect_success '--rebase (am) fast forward' '
303 git reset --hard before-rebase &&
305 git -c rebase.backend=apply pull --rebase . ff &&
306 test_cmp_rev HEAD ff &&
308 # The above only validates the result. Did we actually bypass rebase?
309 git reflog -1 >reflog.actual &&
310 sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
311 echo "OBJID HEAD@{0}: pull --rebase . ff: Fast-forward" >reflog.expected &&
312 test_cmp reflog.expected reflog.fuzzy
315 test_expect_success '--rebase --autostash fast forward' '
318 git checkout to-rebase
319 git branch -D to-rebase-ff
320 git branch -D behind" &&
322 git checkout -b to-rebase-ff &&
323 echo another modification >>file &&
327 git checkout behind &&
329 git pull --rebase --autostash . to-rebase-ff &&
330 test_cmp_rev HEAD to-rebase-ff
333 test_expect_success '--rebase with conflicts shows advice' '
334 test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
335 git checkout -b seq &&
336 test_seq 5 >seq.txt &&
339 git commit -m "Add seq.txt" &&
342 git commit -m "Append to seq.txt" seq.txt &&
343 git checkout -b with-conflicts HEAD^ &&
344 echo conflicting >>seq.txt &&
346 git commit -m "Create conflict" seq.txt &&
347 test_must_fail git pull --rebase . seq 2>err >out &&
348 test_i18ngrep "Resolve all conflicts manually" err
351 test_expect_success 'failed --rebase shows advice' '
352 test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
353 git checkout -b diverging &&
354 test_commit attributes .gitattributes "* text=auto" attrs &&
355 sha1="$(printf "1\\r\\n" | git hash-object -w --stdin)" &&
356 git update-index --cacheinfo 0644 $sha1 file &&
357 git commit -m v1-with-cr &&
358 # force checkout because `git reset --hard` will not leave clean `file`
359 git checkout -f -b fails-to-rebase HEAD^ &&
360 test_commit v2-without-cr file "2" file2-lf &&
361 test_must_fail git pull --rebase . diverging 2>err >out &&
362 test_i18ngrep "Resolve all conflicts manually" err
365 test_expect_success '--rebase fails with multiple branches' '
366 git reset --hard before-rebase &&
367 test_must_fail git pull --rebase . copy main 2>err &&
368 test_cmp_rev HEAD before-rebase &&
369 test_i18ngrep "Cannot rebase onto multiple branches" err &&
370 echo modified >expect &&
371 git show HEAD:file >actual &&
372 test_cmp expect actual
375 test_expect_success 'pull --rebase succeeds with dirty working directory and rebase.autostash set' '
376 test_config rebase.autostash true &&
377 test_pull_autostash 1 --rebase
380 test_expect_success 'pull --rebase --autostash & rebase.autostash=true' '
381 test_config rebase.autostash true &&
382 test_pull_autostash 1 --rebase --autostash
385 test_expect_success 'pull --rebase --autostash & rebase.autostash=false' '
386 test_config rebase.autostash false &&
387 test_pull_autostash 1 --rebase --autostash
390 test_expect_success 'pull --rebase --autostash & rebase.autostash unset' '
391 test_unconfig rebase.autostash &&
392 test_pull_autostash 1 --rebase --autostash
395 test_expect_success 'pull --rebase --no-autostash & rebase.autostash=true' '
396 test_config rebase.autostash true &&
397 test_pull_autostash_fail --rebase --no-autostash
400 test_expect_success 'pull --rebase --no-autostash & rebase.autostash=false' '
401 test_config rebase.autostash false &&
402 test_pull_autostash_fail --rebase --no-autostash
405 test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
406 test_unconfig rebase.autostash &&
407 test_pull_autostash_fail --rebase --no-autostash
410 test_expect_success 'pull succeeds with dirty working directory and merge.autostash set' '
411 test_config merge.autostash true &&
412 test_pull_autostash 2
415 test_expect_success 'pull --autostash & merge.autostash=true' '
416 test_config merge.autostash true &&
417 test_pull_autostash 2 --autostash
420 test_expect_success 'pull --autostash & merge.autostash=false' '
421 test_config merge.autostash false &&
422 test_pull_autostash 2 --autostash
425 test_expect_success 'pull --autostash & merge.autostash unset' '
426 test_unconfig merge.autostash &&
427 test_pull_autostash 2 --autostash
430 test_expect_success 'pull --no-autostash & merge.autostash=true' '
431 test_config merge.autostash true &&
432 test_pull_autostash_fail --no-autostash
435 test_expect_success 'pull --no-autostash & merge.autostash=false' '
436 test_config merge.autostash false &&
437 test_pull_autostash_fail --no-autostash
440 test_expect_success 'pull --no-autostash & merge.autostash unset' '
441 test_unconfig merge.autostash &&
442 test_pull_autostash_fail --no-autostash
445 test_expect_success 'pull.rebase' '
446 git reset --hard before-rebase &&
447 test_config pull.rebase true &&
449 test_cmp_rev HEAD^ copy &&
451 git show HEAD:file2 >actual &&
452 test_cmp expect actual
455 test_expect_success 'pull --autostash & pull.rebase=true' '
456 test_config pull.rebase true &&
457 test_pull_autostash 1 --autostash
460 test_expect_success 'pull --no-autostash & pull.rebase=true' '
461 test_config pull.rebase true &&
462 test_pull_autostash_fail --no-autostash
465 test_expect_success 'branch.to-rebase.rebase' '
466 git reset --hard before-rebase &&
467 test_config branch.to-rebase.rebase true &&
469 test_cmp_rev HEAD^ copy &&
471 git show HEAD:file2 >actual &&
472 test_cmp expect actual
475 test_expect_success 'branch.to-rebase.rebase should override pull.rebase' '
476 git reset --hard before-rebase &&
477 test_config pull.rebase true &&
478 test_config branch.to-rebase.rebase false &&
480 test_cmp_rev ! HEAD^ copy &&
482 git show HEAD:file2 >actual &&
483 test_cmp expect actual
486 test_expect_success 'pull --rebase warns on --verify-signatures' '
487 git reset --hard before-rebase &&
488 git pull --rebase --verify-signatures . copy 2>err &&
489 test_cmp_rev HEAD^ copy &&
491 git show HEAD:file2 >actual &&
492 test_cmp expect actual &&
493 test_i18ngrep "ignoring --verify-signatures for rebase" err
496 test_expect_success 'pull --rebase does not warn on --no-verify-signatures' '
497 git reset --hard before-rebase &&
498 git pull --rebase --no-verify-signatures . copy 2>err &&
499 test_cmp_rev HEAD^ copy &&
501 git show HEAD:file2 >actual &&
502 test_cmp expect actual &&
503 test_i18ngrep ! "verify-signatures" err
506 # add a feature branch, keep-merge, that is merged into main, so the
507 # test can try preserving the merge commit (or not) with various
508 # --rebase flags/pull.rebase settings.
509 test_expect_success 'preserve merge setup' '
510 git reset --hard before-rebase &&
511 git checkout -b keep-merge second^ &&
513 git checkout to-rebase &&
514 git merge keep-merge &&
515 git tag before-preserve-rebase
518 test_expect_success 'pull.rebase=false create a new merge commit' '
519 git reset --hard before-preserve-rebase &&
520 test_config pull.rebase false &&
522 test_cmp_rev HEAD^1 before-preserve-rebase &&
523 test_cmp_rev HEAD^2 copy &&
524 echo file3 >expect &&
525 git show HEAD:file3.t >actual &&
526 test_cmp expect actual
529 test_expect_success 'pull.rebase=true flattens keep-merge' '
530 git reset --hard before-preserve-rebase &&
531 test_config pull.rebase true &&
533 test_cmp_rev HEAD^^ copy &&
534 echo file3 >expect &&
535 git show HEAD:file3.t >actual &&
536 test_cmp expect actual
539 test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' '
540 git reset --hard before-preserve-rebase &&
541 test_config pull.rebase 1 &&
543 test_cmp_rev HEAD^^ copy &&
544 echo file3 >expect &&
545 git show HEAD:file3.t >actual &&
546 test_cmp expect actual
549 test_expect_success REBASE_P \
550 'pull.rebase=preserve rebases and merges keep-merge' '
551 git reset --hard before-preserve-rebase &&
552 test_config pull.rebase preserve &&
554 test_cmp_rev HEAD^^ copy &&
555 test_cmp_rev HEAD^2 keep-merge
558 test_expect_success 'pull.rebase=interactive' '
559 write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
560 echo I was here >fake.out &&
563 test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
564 test_when_finished "test_might_fail git rebase --abort" &&
565 test_must_fail git pull --rebase=interactive . copy &&
566 echo "I was here" >expect &&
567 test_cmp expect fake.out
570 test_expect_success 'pull --rebase=i' '
571 write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
572 echo I was here, too >fake.out &&
575 test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
576 test_when_finished "test_might_fail git rebase --abort" &&
577 test_must_fail git pull --rebase=i . copy &&
578 echo "I was here, too" >expect &&
579 test_cmp expect fake.out
582 test_expect_success 'pull.rebase=invalid fails' '
583 git reset --hard before-preserve-rebase &&
584 test_config pull.rebase invalid &&
585 test_must_fail git pull . copy
588 test_expect_success '--rebase=false create a new merge commit' '
589 git reset --hard before-preserve-rebase &&
590 test_config pull.rebase true &&
591 git pull --rebase=false . copy &&
592 test_cmp_rev HEAD^1 before-preserve-rebase &&
593 test_cmp_rev HEAD^2 copy &&
594 echo file3 >expect &&
595 git show HEAD:file3.t >actual &&
596 test_cmp expect actual
599 test_expect_success '--rebase=true rebases and flattens keep-merge' '
600 git reset --hard before-preserve-rebase &&
601 test_config pull.rebase preserve &&
602 git pull --rebase=true . copy &&
603 test_cmp_rev HEAD^^ copy &&
604 echo file3 >expect &&
605 git show HEAD:file3.t >actual &&
606 test_cmp expect actual
609 test_expect_success REBASE_P \
610 '--rebase=preserve rebases and merges keep-merge' '
611 git reset --hard before-preserve-rebase &&
612 test_config pull.rebase true &&
613 git pull --rebase=preserve . copy &&
614 test_cmp_rev HEAD^^ copy &&
615 test_cmp_rev HEAD^2 keep-merge
618 test_expect_success '--rebase=invalid fails' '
619 git reset --hard before-preserve-rebase &&
620 test_must_fail git pull --rebase=invalid . copy
623 test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '
624 git reset --hard before-preserve-rebase &&
625 test_config pull.rebase preserve &&
626 git pull --rebase . copy &&
627 test_cmp_rev HEAD^^ copy &&
628 echo file3 >expect &&
629 git show HEAD:file3.t >actual &&
630 test_cmp expect actual
633 test_expect_success '--rebase with rebased upstream' '
634 git remote add -f me . &&
637 git reset --hard HEAD^ &&
638 echo conflicting modification >file &&
639 git commit -m conflict file &&
640 git checkout to-rebase &&
642 git commit -m to-rebase file2 &&
643 git tag to-rebase-orig &&
644 git pull --rebase me copy &&
645 echo "conflicting modification" >expect &&
646 test_cmp expect file &&
648 test_cmp expect file2
651 test_expect_success '--rebase -f with rebased upstream' '
652 test_when_finished "test_might_fail git rebase --abort" &&
653 git reset --hard to-rebase-orig &&
654 git pull --rebase -f me copy &&
655 echo "conflicting modification" >expect &&
656 test_cmp expect file &&
658 test_cmp expect file2
661 test_expect_success '--rebase with rebased default upstream' '
662 git update-ref refs/remotes/me/copy copy-orig &&
663 git checkout --track -b to-rebase2 me/copy &&
664 git reset --hard to-rebase-orig &&
666 echo "conflicting modification" >expect &&
667 test_cmp expect file &&
669 test_cmp expect file2
672 test_expect_success 'rebased upstream + fetch + pull --rebase' '
674 git update-ref refs/remotes/me/copy copy-orig &&
675 git reset --hard to-rebase-orig &&
676 git checkout --track -b to-rebase3 me/copy &&
677 git reset --hard to-rebase-orig &&
680 echo "conflicting modification" >expect &&
681 test_cmp expect file &&
683 test_cmp expect file2
687 test_expect_success 'pull --rebase dies early with dirty working directory' '
688 git checkout to-rebase &&
689 git update-ref refs/remotes/me/copy copy^ &&
690 COPY="$(git rev-parse --verify me/copy)" &&
691 git rebase --onto $COPY copy &&
692 test_config branch.to-rebase.remote me &&
693 test_config branch.to-rebase.merge refs/heads/copy &&
694 test_config branch.to-rebase.rebase true &&
697 test_must_fail git pull &&
698 test_cmp_rev "$COPY" me/copy &&
699 git checkout HEAD -- file &&
701 test_cmp_rev ! "$COPY" me/copy
704 test_expect_success 'pull --rebase works on branch yet to be born' '
705 git rev-parse main >expect &&
710 git pull --rebase .. main &&
711 git rev-parse HEAD >../actual
713 test_cmp expect actual
716 test_expect_success 'pull --rebase fails on unborn branch with staged changes' '
717 test_when_finished "rm -rf empty_repo2" &&
718 git init empty_repo2 &&
721 echo staged-file >staged-file &&
722 git add staged-file &&
723 echo staged-file >expect &&
724 git ls-files >actual &&
725 test_cmp expect actual &&
726 test_must_fail git pull --rebase .. main 2>err &&
727 git ls-files >actual &&
728 test_cmp expect actual &&
729 git show :staged-file >actual &&
730 test_cmp expect actual &&
731 test_i18ngrep "unborn branch with changes added to the index" err
735 test_expect_success 'pull --rebase fails on corrupt HEAD' '
736 test_when_finished "rm -rf corrupt" &&
741 git rev-parse --verify HEAD >head &&
742 obj=$(sed "s#^..#&/#" head) &&
743 rm -f .git/objects/$obj &&
744 test_must_fail git pull --rebase
748 test_expect_success 'setup for detecting upstreamed changes' '
753 printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" > stuff &&
755 git commit -m "Initial revision"
760 modify s/5/43/ stuff &&
761 git commit -a -m "5->43" &&
762 modify s/6/42/ stuff &&
763 git commit -a -m "Make it bigger"
767 modify s/5/43/ stuff &&
768 git commit -a -m "Independent discovery of 5->43"
772 test_expect_success 'git pull --rebase detects upstreamed changes' '
776 git ls-files -u >untracked &&
777 test_must_be_empty untracked
781 test_expect_success 'setup for avoiding reapplying old patches' '
784 test_might_fail git rebase --abort &&
785 git reset --hard origin/main
787 git clone --bare src src-replace.git &&
789 mv src-replace.git src &&
792 modify s/2/22/ stuff &&
793 git commit -a -m "Change 2" &&
794 modify s/3/33/ stuff &&
795 git commit -a -m "Change 3" &&
796 modify s/4/44/ stuff &&
797 git commit -a -m "Change 4" &&
800 modify s/44/55/ stuff &&
801 git commit --amend -a -m "Modified Change 4"
805 test_expect_success 'git pull --rebase does not reapply old patches' '
808 test_must_fail git pull --rebase &&
809 cat .git/rebase-merge/done .git/rebase-merge/git-rebase-todo >work &&
810 grep -v -e \# -e ^$ work >patches &&
811 test_line_count = 1 patches &&
816 test_expect_success 'git pull --rebase against local branch' '
817 git checkout -b copy2 to-rebase-orig &&
818 git pull --rebase . to-rebase &&
819 echo "conflicting modification" >expect &&
820 test_cmp expect file &&
822 test_cmp expect file2