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 &&
139 git pull --no-rebase . second &&
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 --no-rebase . 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
'fetch upstream branch even if refspec excludes it' '
222 # the branch names are not important here except that
223 # the first one must not be a prefix of the second,
224 # since otherwise the ref-prefix protocol extension
226 git branch in-refspec HEAD^ &&
227 git branch not-in-refspec HEAD &&
228 git init -b in-refspec downstream &&
229 git -C downstream remote add -t in-refspec origin "file://$(pwd)/.git" &&
230 git -C downstream config branch.in-refspec.remote origin &&
231 git -C downstream config branch.in-refspec.merge refs/heads/not-in-refspec &&
232 git -C downstream pull &&
233 git rev-parse --verify not-in-refspec >expect &&
234 git -C downstream rev-parse --verify HEAD >actual &&
235 test_cmp expect actual
238 test_expect_success
'fail if the index has unresolved entries' '
239 git checkout -b third second^ &&
240 test_when_finished "git checkout -f copy && git branch -D third" &&
242 test_cmp expect file &&
243 test_commit modified2 file &&
244 git ls-files -u >unmerged &&
245 test_must_be_empty unmerged &&
246 test_must_fail git pull --no-rebase . second &&
247 git ls-files -u >unmerged &&
248 test_file_not_empty unmerged &&
250 test_must_fail git pull . second 2>err &&
251 test_i18ngrep "Pulling is not possible because you have unmerged files." err &&
252 test_cmp expected file &&
254 git ls-files -u >unmerged &&
255 test_must_be_empty unmerged &&
256 test_must_fail git pull . second 2>err &&
257 test_i18ngrep "You have not concluded your merge" err &&
258 test_cmp expected file
261 test_expect_success
'fast-forwards working tree if branch head is updated' '
262 git checkout -b third second^ &&
263 test_when_finished "git checkout -f copy && git branch -D third" &&
265 test_cmp expect file &&
266 git pull . second:third 2>err &&
267 test_i18ngrep "fetch updated the current branch head" err &&
268 echo modified >expect &&
269 test_cmp expect file &&
270 test_cmp_rev third second
273 test_expect_success
'fast-forward fails with conflicting work tree' '
274 git checkout -b third second^ &&
275 test_when_finished "git checkout -f copy && git branch -D third" &&
277 test_cmp expect file &&
278 echo conflict >file &&
279 test_must_fail git pull . second:third 2>err &&
280 test_i18ngrep "Cannot fast-forward your working tree" err &&
281 echo conflict >expect &&
282 test_cmp expect file &&
283 test_cmp_rev third second
286 test_expect_success
'--rebase' '
287 git branch to-rebase &&
288 echo modified again >file &&
289 git commit -m file file &&
290 git checkout to-rebase &&
293 git commit -m "new file" &&
294 git tag before-rebase &&
295 git pull --rebase . copy &&
296 test_cmp_rev HEAD^ copy &&
298 git show HEAD:file2 >actual &&
299 test_cmp expect actual
302 test_expect_success
'--rebase (merge) fast forward' '
303 git reset --hard before-rebase &&
304 git checkout -b ff &&
305 echo another modification >file &&
306 git commit -m third file &&
308 git checkout to-rebase &&
309 git -c rebase.backend=merge pull --rebase . ff &&
310 test_cmp_rev HEAD ff &&
312 # The above only validates the result. Did we actually bypass rebase?
313 git reflog -1 >reflog.actual &&
314 sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
315 echo "OBJID HEAD@{0}: pull --rebase . ff: Fast-forward" >reflog.expected &&
316 test_cmp reflog.expected reflog.fuzzy
319 test_expect_success
'--rebase (am) fast forward' '
320 git reset --hard before-rebase &&
322 git -c rebase.backend=apply pull --rebase . ff &&
323 test_cmp_rev HEAD ff &&
325 # The above only validates the result. Did we actually bypass rebase?
326 git reflog -1 >reflog.actual &&
327 sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
328 echo "OBJID HEAD@{0}: pull --rebase . ff: Fast-forward" >reflog.expected &&
329 test_cmp reflog.expected reflog.fuzzy
332 test_expect_success
'--rebase --autostash fast forward' '
335 git checkout to-rebase
336 git branch -D to-rebase-ff
337 git branch -D behind" &&
339 git checkout -b to-rebase-ff &&
340 echo another modification >>file &&
344 git checkout behind &&
346 git pull --rebase --autostash . to-rebase-ff &&
347 test_cmp_rev HEAD to-rebase-ff
350 test_expect_success
'--rebase with rebase.autostash succeeds on ff' '
351 test_when_finished "rm -fr src dst actual" &&
353 test_commit -C src "initial" file "content" &&
355 test_commit -C src --printf "more_content" file "more content\ncontent\n" &&
356 echo "dirty" >>dst/file &&
357 test_config -C dst rebase.autostash true &&
358 git -C dst pull --rebase >actual 2>&1 &&
359 grep -q "Fast-forward" actual &&
360 grep -q "Applied autostash." actual
363 test_expect_success
'--rebase with conflicts shows advice' '
364 test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
365 git checkout -b seq &&
366 test_seq 5 >seq.txt &&
369 git commit -m "Add seq.txt" &&
372 git commit -m "Append to seq.txt" seq.txt &&
373 git checkout -b with-conflicts HEAD^ &&
374 echo conflicting >>seq.txt &&
376 git commit -m "Create conflict" seq.txt &&
377 test_must_fail git pull --rebase . seq 2>err >out &&
378 test_i18ngrep "Resolve all conflicts manually" err
381 test_expect_success
'failed --rebase shows advice' '
382 test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
383 git checkout -b diverging &&
384 test_commit attributes .gitattributes "* text=auto" attrs &&
385 sha1="$(printf "1\\r\\n" | git hash-object -w --stdin)" &&
386 git update-index --cacheinfo 0644 $sha1 file &&
387 git commit -m v1-with-cr &&
388 # force checkout because `git reset --hard` will not leave clean `file`
389 git checkout -f -b fails-to-rebase HEAD^ &&
390 test_commit v2-without-cr file "2" file2-lf &&
391 test_must_fail git pull --rebase . diverging 2>err >out &&
392 test_i18ngrep "Resolve all conflicts manually" err
395 test_expect_success
'--rebase fails with multiple branches' '
396 git reset --hard before-rebase &&
397 test_must_fail git pull --rebase . copy main 2>err &&
398 test_cmp_rev HEAD before-rebase &&
399 test_i18ngrep "Cannot rebase onto multiple branches" err &&
400 echo modified >expect &&
401 git show HEAD:file >actual &&
402 test_cmp expect actual
405 test_expect_success
'pull --rebase succeeds with dirty working directory and rebase.autostash set' '
406 test_config rebase.autostash true &&
407 test_pull_autostash 1 --rebase
410 test_expect_success
'pull --rebase --autostash & rebase.autostash=true' '
411 test_config rebase.autostash true &&
412 test_pull_autostash 1 --rebase --autostash
415 test_expect_success
'pull --rebase --autostash & rebase.autostash=false' '
416 test_config rebase.autostash false &&
417 test_pull_autostash 1 --rebase --autostash
420 test_expect_success
'pull --rebase --autostash & rebase.autostash unset' '
421 test_unconfig rebase.autostash &&
422 test_pull_autostash 1 --rebase --autostash
425 test_expect_success
'pull --rebase --no-autostash & rebase.autostash=true' '
426 test_config rebase.autostash true &&
427 test_pull_autostash_fail --rebase --no-autostash
430 test_expect_success
'pull --rebase --no-autostash & rebase.autostash=false' '
431 test_config rebase.autostash false &&
432 test_pull_autostash_fail --rebase --no-autostash
435 test_expect_success
'pull --rebase --no-autostash & rebase.autostash unset' '
436 test_unconfig rebase.autostash &&
437 test_pull_autostash_fail --rebase --no-autostash
440 test_expect_success
'pull succeeds with dirty working directory and merge.autostash set' '
441 test_config merge.autostash true &&
442 test_pull_autostash 2 --no-rebase
445 test_expect_success
'pull --autostash & merge.autostash=true' '
446 test_config merge.autostash true &&
447 test_pull_autostash 2 --autostash --no-rebase
450 test_expect_success
'pull --autostash & merge.autostash=false' '
451 test_config merge.autostash false &&
452 test_pull_autostash 2 --autostash --no-rebase
455 test_expect_success
'pull --autostash & merge.autostash unset' '
456 test_unconfig merge.autostash &&
457 test_pull_autostash 2 --autostash --no-rebase
460 test_expect_success
'pull --no-autostash & merge.autostash=true' '
461 test_config merge.autostash true &&
462 test_pull_autostash_fail --no-autostash --no-rebase
465 test_expect_success
'pull --no-autostash & merge.autostash=false' '
466 test_config merge.autostash false &&
467 test_pull_autostash_fail --no-autostash --no-rebase
470 test_expect_success
'pull --no-autostash & merge.autostash unset' '
471 test_unconfig merge.autostash &&
472 test_pull_autostash_fail --no-autostash --no-rebase
475 test_expect_success
'pull.rebase' '
476 git reset --hard before-rebase &&
477 test_config pull.rebase true &&
479 test_cmp_rev HEAD^ copy &&
481 git show HEAD:file2 >actual &&
482 test_cmp expect actual
485 test_expect_success
'pull --autostash & pull.rebase=true' '
486 test_config pull.rebase true &&
487 test_pull_autostash 1 --autostash
490 test_expect_success
'pull --no-autostash & pull.rebase=true' '
491 test_config pull.rebase true &&
492 test_pull_autostash_fail --no-autostash
495 test_expect_success
'branch.to-rebase.rebase' '
496 git reset --hard before-rebase &&
497 test_config branch.to-rebase.rebase true &&
499 test_cmp_rev HEAD^ copy &&
501 git show HEAD:file2 >actual &&
502 test_cmp expect actual
505 test_expect_success
'branch.to-rebase.rebase should override pull.rebase' '
506 git reset --hard before-rebase &&
507 test_config pull.rebase true &&
508 test_config branch.to-rebase.rebase false &&
510 test_cmp_rev ! HEAD^ copy &&
512 git show HEAD:file2 >actual &&
513 test_cmp expect actual
516 test_expect_success
'pull --rebase warns on --verify-signatures' '
517 git reset --hard before-rebase &&
518 git pull --rebase --verify-signatures . copy 2>err &&
519 test_cmp_rev HEAD^ copy &&
521 git show HEAD:file2 >actual &&
522 test_cmp expect actual &&
523 test_i18ngrep "ignoring --verify-signatures for rebase" err
526 test_expect_success
'pull --rebase does not warn on --no-verify-signatures' '
527 git reset --hard before-rebase &&
528 git pull --rebase --no-verify-signatures . copy 2>err &&
529 test_cmp_rev HEAD^ copy &&
531 git show HEAD:file2 >actual &&
532 test_cmp expect actual &&
533 test_i18ngrep ! "verify-signatures" err
536 # add a feature branch, keep-merge, that is merged into main, so the
537 # test can try preserving the merge commit (or not) with various
538 # --rebase flags/pull.rebase settings.
539 test_expect_success
'preserve merge setup' '
540 git reset --hard before-rebase &&
541 git checkout -b keep-merge second^ &&
543 git checkout to-rebase &&
544 git merge keep-merge &&
545 git tag before-preserve-rebase
548 test_expect_success
'pull.rebase=false create a new merge commit' '
549 git reset --hard before-preserve-rebase &&
550 test_config pull.rebase false &&
552 test_cmp_rev HEAD^1 before-preserve-rebase &&
553 test_cmp_rev HEAD^2 copy &&
554 echo file3 >expect &&
555 git show HEAD:file3.t >actual &&
556 test_cmp expect actual
559 test_expect_success
'pull.rebase=true flattens keep-merge' '
560 git reset --hard before-preserve-rebase &&
561 test_config pull.rebase true &&
563 test_cmp_rev HEAD^^ copy &&
564 echo file3 >expect &&
565 git show HEAD:file3.t >actual &&
566 test_cmp expect actual
569 test_expect_success
'pull.rebase=1 is treated as true and flattens keep-merge' '
570 git reset --hard before-preserve-rebase &&
571 test_config pull.rebase 1 &&
573 test_cmp_rev HEAD^^ copy &&
574 echo file3 >expect &&
575 git show HEAD:file3.t >actual &&
576 test_cmp expect actual
579 test_expect_success
'pull.rebase=interactive' '
580 write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
581 echo I was here >fake.out &&
584 test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
585 test_when_finished "test_might_fail git rebase --abort" &&
586 test_must_fail git pull --rebase=interactive . copy &&
587 echo "I was here" >expect &&
588 test_cmp expect fake.out
591 test_expect_success
'pull --rebase=i' '
592 write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
593 echo I was here, too >fake.out &&
596 test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
597 test_when_finished "test_might_fail git rebase --abort" &&
598 test_must_fail git pull --rebase=i . copy &&
599 echo "I was here, too" >expect &&
600 test_cmp expect fake.out
603 test_expect_success
'pull.rebase=invalid fails' '
604 git reset --hard before-preserve-rebase &&
605 test_config pull.rebase invalid &&
606 test_must_fail git pull . copy
609 test_expect_success
'--rebase=false create a new merge commit' '
610 git reset --hard before-preserve-rebase &&
611 test_config pull.rebase true &&
612 git pull --rebase=false . copy &&
613 test_cmp_rev HEAD^1 before-preserve-rebase &&
614 test_cmp_rev HEAD^2 copy &&
615 echo file3 >expect &&
616 git show HEAD:file3.t >actual &&
617 test_cmp expect actual
620 test_expect_success
'--rebase=true rebases and flattens keep-merge' '
621 git reset --hard before-preserve-rebase &&
622 test_config pull.rebase merges &&
623 git pull --rebase=true . copy &&
624 test_cmp_rev HEAD^^ copy &&
625 echo file3 >expect &&
626 git show HEAD:file3.t >actual &&
627 test_cmp expect actual
630 test_expect_success
'--rebase=invalid fails' '
631 git reset --hard before-preserve-rebase &&
632 test_must_fail git pull --rebase=invalid . copy
635 test_expect_success
'--rebase overrides pull.rebase=merges and flattens keep-merge' '
636 git reset --hard before-preserve-rebase &&
637 test_config pull.rebase merges &&
638 git pull --rebase . copy &&
639 test_cmp_rev HEAD^^ copy &&
640 echo file3 >expect &&
641 git show HEAD:file3.t >actual &&
642 test_cmp expect actual
645 test_expect_success
'--rebase with rebased upstream' '
646 git remote add -f me . &&
649 git reset --hard HEAD^ &&
650 echo conflicting modification >file &&
651 git commit -m conflict file &&
652 git checkout to-rebase &&
654 git commit -m to-rebase file2 &&
655 git tag to-rebase-orig &&
656 git pull --rebase me copy &&
657 echo "conflicting modification" >expect &&
658 test_cmp expect file &&
660 test_cmp expect file2
663 test_expect_success
'--rebase -f with rebased upstream' '
664 test_when_finished "test_might_fail git rebase --abort" &&
665 git reset --hard to-rebase-orig &&
666 git pull --rebase -f me copy &&
667 echo "conflicting modification" >expect &&
668 test_cmp expect file &&
670 test_cmp expect file2
673 test_expect_success
'--rebase with rebased default upstream' '
674 git update-ref refs/remotes/me/copy copy-orig &&
675 git checkout --track -b to-rebase2 me/copy &&
676 git reset --hard to-rebase-orig &&
678 echo "conflicting modification" >expect &&
679 test_cmp expect file &&
681 test_cmp expect file2
684 test_expect_success
'rebased upstream + fetch + pull --rebase' '
686 git update-ref refs/remotes/me/copy copy-orig &&
687 git reset --hard to-rebase-orig &&
688 git checkout --track -b to-rebase3 me/copy &&
689 git reset --hard to-rebase-orig &&
692 echo "conflicting modification" >expect &&
693 test_cmp expect file &&
695 test_cmp expect file2
699 test_expect_success
'pull --rebase dies early with dirty working directory' '
700 git checkout to-rebase &&
701 git update-ref refs/remotes/me/copy copy^ &&
702 COPY="$(git rev-parse --verify me/copy)" &&
703 git rebase --onto $COPY copy &&
704 test_config branch.to-rebase.remote me &&
705 test_config branch.to-rebase.merge refs/heads/copy &&
706 test_config branch.to-rebase.rebase true &&
709 test_must_fail git pull &&
710 test_cmp_rev "$COPY" me/copy &&
711 git checkout HEAD -- file &&
713 test_cmp_rev ! "$COPY" me/copy
716 test_expect_success
'pull --rebase works on branch yet to be born' '
717 git rev-parse main >expect &&
722 git pull --rebase .. main &&
723 git rev-parse HEAD >../actual
725 test_cmp expect actual
728 test_expect_success
'pull --rebase fails on unborn branch with staged changes' '
729 test_when_finished "rm -rf empty_repo2" &&
730 git init empty_repo2 &&
733 echo staged-file >staged-file &&
734 git add staged-file &&
735 echo staged-file >expect &&
736 git ls-files >actual &&
737 test_cmp expect actual &&
738 test_must_fail git pull --rebase .. main 2>err &&
739 git ls-files >actual &&
740 test_cmp expect actual &&
741 git show :staged-file >actual &&
742 test_cmp expect actual &&
743 test_i18ngrep "unborn branch with changes added to the index" err
747 test_expect_success
'pull --rebase fails on corrupt HEAD' '
748 test_when_finished "rm -rf corrupt" &&
753 git rev-parse --verify HEAD >head &&
754 obj=$(sed "s#^..#&/#" head) &&
755 rm -f .git/objects/$obj &&
756 test_must_fail git pull --rebase
760 test_expect_success
'setup for detecting upstreamed changes' '
761 test_create_repo src &&
762 test_commit -C src --printf one stuff "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" &&
766 modify s/5/43/ stuff &&
767 git commit -a -m "5->43" &&
768 modify s/6/42/ stuff &&
769 git commit -a -m "Make it bigger"
773 modify s/5/43/ stuff &&
774 git commit -a -m "Independent discovery of 5->43"
778 test_expect_success
'git pull --rebase detects upstreamed changes' '
782 git ls-files -u >untracked &&
783 test_must_be_empty untracked
787 test_expect_success
'setup for avoiding reapplying old patches' '
790 test_might_fail git rebase --abort &&
791 git reset --hard origin/main
793 git clone --bare src src-replace.git &&
795 mv src-replace.git src &&
798 modify s/2/22/ stuff &&
799 git commit -a -m "Change 2" &&
800 modify s/3/33/ stuff &&
801 git commit -a -m "Change 3" &&
802 modify s/4/44/ stuff &&
803 git commit -a -m "Change 4" &&
806 modify s/44/55/ stuff &&
807 git commit --amend -a -m "Modified Change 4"
811 test_expect_success
'git pull --rebase does not reapply old patches' '
814 test_must_fail git pull --rebase &&
815 cat .git/rebase-merge/done .git/rebase-merge/git-rebase-todo >work &&
816 grep -v -e \# -e ^$ work >patches &&
817 test_line_count = 1 patches &&
822 test_expect_success
'git pull --rebase against local branch' '
823 git checkout -b copy2 to-rebase-orig &&
824 git pull --rebase . to-rebase &&
825 echo "conflicting modification" >expect &&
826 test_cmp expect file &&
828 test_cmp expect file2