3 test_description
='git remote porcelain-ish'
14 git commit
-m "Initial" &&
15 git checkout
-b side
&&
19 git commit
-m "Second" &&
25 echo "$1" |
tr ' ' '\012' |
sort |
sed -e '/^$/d' >expect
&&
26 echo "$2" |
tr ' ' '\012' |
sort |
sed -e '/^$/d' >actual
&&
27 test_cmp expect actual
30 check_remote_track
() {
31 actual
=$
(git remote show
"$1" |
sed -ne 's|^ \(.*\) tracked$|\1|p')
33 tokens_match
"$*" "$actual"
36 check_tracking_branch
() {
38 r
=$
(git for-each-ref
"--format=%(refname)" |
39 sed -ne "s|^refs/remotes/$1/||p") &&
41 tokens_match
"$*" "$r"
44 test_expect_success setup
'
46 setup_repository one &&
47 setup_repository two &&
49 cd two && git branch another
55 test_expect_success
'remote information for the origin' '
58 tokens_match origin "$(git remote)" &&
59 check_remote_track origin master side &&
60 check_tracking_branch origin HEAD master side
64 test_expect_success
'add another remote' '
67 git remote add -f second ../two &&
68 tokens_match "origin second" "$(git remote)" &&
69 check_remote_track origin master side &&
70 check_remote_track second master side another &&
71 check_tracking_branch second master side another &&
72 git for-each-ref "--format=%(refname)" refs/remotes |
73 sed -e "/^refs\/remotes\/origin\//d" \
74 -e "/^refs\/remotes\/second\//d" >actual &&
76 test_cmp expect actual
80 test_expect_success
'remote forces tracking branches' '
83 case `git config remote.second.fetch` in
90 test_expect_success
'remove remote' '
93 git symbolic-ref refs/remotes/second/HEAD refs/remotes/second/master &&
98 test_expect_success
'remove remote' '
101 tokens_match origin "$(git remote)" &&
102 check_remote_track origin master side &&
103 git for-each-ref "--format=%(refname)" refs/remotes |
104 sed -e "/^refs\/remotes\/origin\//d" >actual &&
106 test_cmp expect actual
110 test_expect_success
'remove remote protects local branches' '
114 Note: A branch outside the refs/remotes/ hierarchy was not removed;
120 Note: Some branches outside the refs/remotes/ hierarchy were not removed;
122 git branch -d foobranch
127 git config --add remote.oops.fetch "+refs/*:refs/*" &&
128 git remote rm oops 2>actual1 &&
129 git branch foobranch &&
130 git config --add remote.oops.fetch "+refs/*:refs/*" &&
131 git remote rm oops 2>actual2 &&
132 git branch -d foobranch &&
134 test_cmp expect1 actual1 &&
135 test_cmp expect2 actual2
139 cat > test
/expect
<< EOF
141 Fetch URL: $(pwd)/one
145 master new (next fetch will store in remotes/origin)
147 Local branches configured for 'git pull':
148 ahead merges with remote master
149 master merges with remote master
150 octopus merges with remote topic-a
151 and with remote topic-b
152 and with remote topic-c
153 rebase rebases onto remote master
154 Local refs configured for 'git push':
155 master pushes to master (local out of date)
156 master pushes to upstream (create)
160 HEAD branch (remote HEAD is ambiguous, may be one of the following):
163 Local refs configured for 'git push':
164 ahead forces to master (fast-forwardable)
165 master pushes to another (up to date)
168 test_expect_success
'show' '
170 git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream &&
172 git checkout -b ahead origin/master &&
175 git commit -m update file &&
176 git checkout master &&
177 git branch --track octopus origin/master &&
178 git branch --track rebase origin/master &&
179 git branch -d -r origin/master &&
180 git config --add remote.two.url ../two &&
181 git config --add remote.two.pushurl ../three &&
182 git config branch.rebase.rebase true &&
183 git config branch.octopus.merge "topic-a topic-b topic-c" &&
187 git commit -m update file) &&
188 git config --add remote.origin.push : &&
189 git config --add remote.origin.push refs/heads/master:refs/heads/upstream &&
190 git config --add remote.origin.push +refs/tags/lastbackup &&
191 git config --add remote.two.push +refs/heads/ahead:refs/heads/master &&
192 git config --add remote.two.push refs/heads/master:refs/heads/another &&
193 git remote show origin two > output &&
194 git branch -d rebase octopus &&
195 test_cmp expect output)
198 cat > test
/expect
<< EOF
200 Fetch URL: $(pwd)/one
202 HEAD branch: (not queried)
203 Remote branches: (status not queried)
206 Local branches configured for 'git pull':
207 ahead merges with remote master
208 master merges with remote master
209 Local refs configured for 'git push' (status not queried):
210 (matching) pushes to (matching)
211 refs/heads/master pushes to refs/heads/upstream
212 refs/tags/lastbackup forces to refs/tags/lastbackup
215 test_expect_success
'show -n' '
216 (mv one one.unreachable &&
218 git remote show -n origin > output &&
219 mv ../one.unreachable ../one &&
220 test_cmp expect output)
223 test_expect_success
'prune' '
225 git branch -m side side2) &&
228 git remote prune origin &&
229 git rev-parse refs/remotes/origin/side2 &&
230 test_must_fail git rev-parse refs/remotes/origin/side)
233 test_expect_success
'set-head --delete' '
235 git symbolic-ref refs/remotes/origin/HEAD &&
236 git remote set-head --delete origin &&
237 test_must_fail git symbolic-ref refs/remotes/origin/HEAD)
240 test_expect_success
'set-head --auto' '
242 git remote set-head --auto origin &&
243 echo refs/remotes/origin/master >expect &&
244 git symbolic-ref refs/remotes/origin/HEAD >output &&
245 test_cmp expect output
249 cat >test
/expect
<<EOF
250 error: Multiple remote HEAD branches. Please choose one explicitly with:
251 git remote set-head two another
252 git remote set-head two master
255 test_expect_success
'set-head --auto fails w/multiple HEADs' '
257 test_must_fail git remote set-head --auto two >output 2>&1 &&
258 test_cmp expect output)
261 cat >test
/expect
<<EOF
262 refs/remotes/origin/side2
265 test_expect_success
'set-head explicit' '
267 git remote set-head origin side2 &&
268 git symbolic-ref refs/remotes/origin/HEAD >output &&
269 git remote set-head origin master &&
270 test_cmp expect output)
273 cat > test
/expect
<< EOF
276 * [would prune] origin/side2
279 test_expect_success
'prune --dry-run' '
281 git branch -m side2 side) &&
283 git remote prune --dry-run origin > output &&
284 git rev-parse refs/remotes/origin/side2 &&
285 test_must_fail git rev-parse refs/remotes/origin/side &&
287 git branch -m side side2) &&
288 test_cmp expect output)
291 test_expect_success
'add --mirror && prune' '
295 git remote add --mirror -f origin ../one) &&
297 git branch -m side2 side) &&
299 git rev-parse --verify refs/heads/side2 &&
300 test_must_fail git rev-parse --verify refs/heads/side &&
302 git remote prune origin &&
303 test_must_fail git rev-parse --verify refs/heads/side2 &&
304 git rev-parse --verify refs/heads/side)
307 test_expect_success
'add alt && prune' '
311 git remote add -f origin ../one &&
312 git config remote.alt.url ../one &&
313 git config remote.alt.fetch "+refs/heads/*:refs/remotes/origin/*") &&
315 git branch -m side side2) &&
317 git rev-parse --verify refs/remotes/origin/side &&
318 test_must_fail git rev-parse --verify refs/remotes/origin/side2 &&
320 git remote prune alt &&
321 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
322 git rev-parse --verify refs/remotes/origin/side2)
325 cat >test
/expect
<<\EOF
329 test_expect_success
'add with reachable tags (default)' '
333 git commit -m "Foobar" &&
334 git tag -a -m "Foobar tag" foobar-tag &&
335 git reset --hard HEAD~1 &&
336 git tag -a -m "Some tag" some-tag) &&
340 git remote add -f origin ../one &&
341 git tag -l some-tag >../test/output &&
342 git tag -l foobar-tag >>../test/output &&
343 test_must_fail git config remote.origin.tagopt) &&
344 test_cmp test/expect test/output
347 cat >test
/expect
<<\EOF
353 test_expect_success
'add --tags' '
358 git remote add -f --tags origin ../one &&
359 git tag -l some-tag >../test/output &&
360 git tag -l foobar-tag >>../test/output &&
361 git config remote.origin.tagopt >>../test/output) &&
362 test_cmp test/expect test/output
365 cat >test
/expect
<<\EOF
369 test_expect_success
'add --no-tags' '
374 git remote add -f --no-tags origin ../one &&
375 git tag -l some-tag >../test/output &&
376 git tag -l foobar-tag >../test/output &&
377 git config remote.origin.tagopt >>../test/output) &&
379 git tag -d some-tag foobar-tag) &&
380 test_cmp test/expect test/output
383 test_expect_success
'reject --no-no-tags' '
385 test_must_fail git remote add -f --no-no-tags neworigin ../one)
388 cat > one
/expect
<< EOF
396 test_expect_success
'update' '
399 git remote add drosophila ../two &&
400 git remote add apis ../mirror &&
402 git branch -r > output &&
403 test_cmp expect output)
407 cat > one
/expect
<< EOF
417 test_expect_success
'update with arguments' '
420 for b in $(git branch -r)
422 git branch -r -d $b || break
424 git remote add manduca ../mirror &&
425 git remote add megaloprepus ../mirror &&
426 git config remotes.phobaeticus "drosophila megaloprepus" &&
427 git config remotes.titanus manduca &&
428 git remote update phobaeticus titanus &&
429 git branch -r > output &&
430 test_cmp expect output)
434 test_expect_success
'update --prune' '
437 git branch -m side2 side3) &&
439 git remote update --prune &&
440 (cd ../one && git branch -m side3 side2) &&
441 git rev-parse refs/remotes/origin/side3 &&
442 test_must_fail git rev-parse refs/remotes/origin/side2)
445 cat > one
/expect
<< EOF
454 test_expect_success
'update default' '
457 for b in $(git branch -r)
459 git branch -r -d $b || break
461 git config remote.drosophila.skipDefaultUpdate true &&
462 git remote update default &&
463 git branch -r > output &&
464 test_cmp expect output)
468 cat > one
/expect
<< EOF
474 test_expect_success
'update default (overridden, with funny whitespace)' '
477 for b in $(git branch -r)
479 git branch -r -d $b || break
481 git config remotes.default "$(printf "\t drosophila \n")" &&
482 git remote update default &&
483 git branch -r > output &&
484 test_cmp expect output)
488 test_expect_success
'update (with remotes.default defined)' '
491 for b in $(git branch -r)
493 git branch -r -d $b || break
495 git config remotes.default "drosophila" &&
497 git branch -r > output &&
498 test_cmp expect output)
502 test_expect_success
'"remote show" does not show symbolic refs' '
504 git clone one three &&
506 git remote show origin > output &&
507 ! grep "^ *HEAD$" < output &&
508 ! grep -i stale < output)
512 test_expect_success
'reject adding remote with an invalid name' '
514 test_must_fail git remote add some:url desired-name
518 # The first three test if the tracking branches are properly renamed,
519 # the last two ones check if the config is updated.
521 test_expect_success
'rename a remote' '
523 git clone one four &&
525 git remote rename origin upstream &&
526 rmdir .git/refs/remotes/origin &&
527 test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" &&
528 test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" &&
529 test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
530 test "$(git config branch.master.remote)" = "upstream")
534 cat > remotes_origin
<< EOF
536 Push: refs/heads/master:refs/heads/upstream
537 Pull: refs/heads/master:refs/heads/origin
540 test_expect_success
'migrate a remote from named file in $GIT_DIR/remotes' '
541 git clone one five &&
542 origin_url=$(pwd)/one &&
544 git remote rm origin &&
545 mkdir -p .git/remotes &&
546 cat ../remotes_origin > .git/remotes/origin &&
547 git remote rename origin origin &&
548 ! test -f .git/remotes/origin &&
549 test "$(git config remote.origin.url)" = "$origin_url" &&
550 test "$(git config remote.origin.push)" = "refs/heads/master:refs/heads/upstream" &&
551 test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin")
554 test_expect_success
'migrate a remote from named file in $GIT_DIR/branches' '
556 origin_url=$(pwd)/one &&
558 git remote rm origin &&
559 echo "$origin_url" > .git/branches/origin &&
560 git remote rename origin origin &&
561 ! test -f .git/branches/origin &&
562 test "$(git config remote.origin.url)" = "$origin_url" &&
563 test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin")
566 test_expect_success
'remote prune to cause a dangling symref' '
567 git clone one seven &&
570 git checkout side2 &&
575 git remote prune origin
577 grep "has become dangling" err &&
579 : And the dangling symref will not cause other annoying errors &&
584 ! grep "points nowhere" err &&
587 test_must_fail git branch nomore origin
589 grep "dangling symref" err
592 test_expect_success
'show empty remote' '
594 test_create_repo empty &&
595 git clone empty empty-clone &&
598 git remote show origin
602 test_expect_success
'remote set-branches requires a remote' '
603 test_must_fail git remote set-branches &&
604 test_must_fail git remote set-branches --add
607 test_expect_success
'remote set-branches' '
608 echo "+refs/heads/*:refs/remotes/scratch/*" >expect.initial &&
609 sort <<-\EOF >expect.add &&
610 +refs/heads/*:refs/remotes/scratch/*
611 +refs/heads/other:refs/remotes/scratch/other
613 sort <<-\EOF >expect.replace &&
614 +refs/heads/maint:refs/remotes/scratch/maint
615 +refs/heads/master:refs/remotes/scratch/master
616 +refs/heads/next:refs/remotes/scratch/next
618 sort <<-\EOF >expect.add-two &&
619 +refs/heads/maint:refs/remotes/scratch/maint
620 +refs/heads/master:refs/remotes/scratch/master
621 +refs/heads/next:refs/remotes/scratch/next
622 +refs/heads/pu:refs/remotes/scratch/pu
623 +refs/heads/t/topic:refs/remotes/scratch/t/topic
625 sort <<-\EOF >expect.setup-ffonly &&
626 refs/heads/master:refs/remotes/scratch/master
627 +refs/heads/next:refs/remotes/scratch/next
629 sort <<-\EOF >expect.respect-ffonly &&
630 refs/heads/master:refs/remotes/scratch/master
631 +refs/heads/next:refs/remotes/scratch/next
632 +refs/heads/pu:refs/remotes/scratch/pu
635 git clone .git/ setbranches &&
638 git remote rename origin scratch &&
639 git config --get-all remote.scratch.fetch >config-result &&
640 sort <config-result >../actual.initial &&
642 git remote set-branches scratch --add other &&
643 git config --get-all remote.scratch.fetch >config-result &&
644 sort <config-result >../actual.add &&
646 git remote set-branches scratch maint master next &&
647 git config --get-all remote.scratch.fetch >config-result &&
648 sort <config-result >../actual.replace &&
650 git remote set-branches --add scratch pu t/topic &&
651 git config --get-all remote.scratch.fetch >config-result &&
652 sort <config-result >../actual.add-two &&
654 git config --unset-all remote.scratch.fetch &&
655 git config remote.scratch.fetch \
656 refs/heads/master:refs/remotes/scratch/master &&
657 git config --add remote.scratch.fetch \
658 +refs/heads/next:refs/remotes/scratch/next &&
659 git config --get-all remote.scratch.fetch >config-result &&
660 sort <config-result >../actual.setup-ffonly &&
662 git remote set-branches --add scratch pu &&
663 git config --get-all remote.scratch.fetch >config-result &&
664 sort <config-result >../actual.respect-ffonly
666 test_cmp expect.initial actual.initial &&
667 test_cmp expect.add actual.add &&
668 test_cmp expect.replace actual.replace &&
669 test_cmp expect.add-two actual.add-two &&
670 test_cmp expect.setup-ffonly actual.setup-ffonly &&
671 test_cmp expect.respect-ffonly actual.respect-ffonly
674 test_expect_success
'remote set-branches with --mirror' '
675 echo "+refs/*:refs/*" >expect.initial &&
676 echo "+refs/heads/master:refs/heads/master" >expect.replace &&
677 git clone --mirror .git/ setbranches-mirror &&
679 cd setbranches-mirror &&
680 git remote rename origin scratch &&
681 git config --get-all remote.scratch.fetch >../actual.initial &&
683 git remote set-branches scratch heads/master &&
684 git config --get-all remote.scratch.fetch >../actual.replace
686 test_cmp expect.initial actual.initial &&
687 test_cmp expect.replace actual.replace
690 test_expect_success
'new remote' '
691 git remote add someremote foo &&
693 git config --get-all remote.someremote.url >actual &&
697 test_expect_success
'remote set-url bar' '
698 git remote set-url someremote bar &&
700 git config --get-all remote.someremote.url >actual &&
704 test_expect_success
'remote set-url baz bar' '
705 git remote set-url someremote baz bar &&
707 git config --get-all remote.someremote.url >actual &&
711 test_expect_success
'remote set-url zot bar' '
712 test_must_fail git remote set-url someremote zot bar &&
714 git config --get-all remote.someremote.url >actual &&
718 test_expect_success
'remote set-url --push zot baz' '
719 test_must_fail git remote set-url --push someremote zot baz &&
720 echo "YYY" >expect &&
722 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
723 echo "YYY" >>actual &&
724 git config --get-all remote.someremote.url >>actual &&
728 test_expect_success
'remote set-url --push zot' '
729 git remote set-url --push someremote zot &&
731 echo "YYY" >>expect &&
733 git config --get-all remote.someremote.pushurl >actual &&
734 echo "YYY" >>actual &&
735 git config --get-all remote.someremote.url >>actual &&
739 test_expect_success
'remote set-url --push qux zot' '
740 git remote set-url --push someremote qux zot &&
742 echo "YYY" >>expect &&
744 git config --get-all remote.someremote.pushurl >actual &&
745 echo "YYY" >>actual &&
746 git config --get-all remote.someremote.url >>actual &&
750 test_expect_success
'remote set-url --push foo qu+x' '
751 git remote set-url --push someremote foo qu+x &&
753 echo "YYY" >>expect &&
755 git config --get-all remote.someremote.pushurl >actual &&
756 echo "YYY" >>actual &&
757 git config --get-all remote.someremote.url >>actual &&
761 test_expect_success
'remote set-url --push --add aaa' '
762 git remote set-url --push --add someremote aaa &&
765 echo "YYY" >>expect &&
767 git config --get-all remote.someremote.pushurl >actual &&
768 echo "YYY" >>actual &&
769 git config --get-all remote.someremote.url >>actual &&
773 test_expect_success
'remote set-url --push bar aaa' '
774 git remote set-url --push someremote bar aaa &&
777 echo "YYY" >>expect &&
779 git config --get-all remote.someremote.pushurl >actual &&
780 echo "YYY" >>actual &&
781 git config --get-all remote.someremote.url >>actual &&
785 test_expect_success
'remote set-url --push --delete bar' '
786 git remote set-url --push --delete someremote bar &&
788 echo "YYY" >>expect &&
790 git config --get-all remote.someremote.pushurl >actual &&
791 echo "YYY" >>actual &&
792 git config --get-all remote.someremote.url >>actual &&
796 test_expect_success
'remote set-url --push --delete foo' '
797 git remote set-url --push --delete someremote foo &&
798 echo "YYY" >expect &&
800 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
801 echo "YYY" >>actual &&
802 git config --get-all remote.someremote.url >>actual &&
806 test_expect_success
'remote set-url --add bbb' '
807 git remote set-url --add someremote bbb &&
808 echo "YYY" >expect &&
811 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
812 echo "YYY" >>actual &&
813 git config --get-all remote.someremote.url >>actual &&
817 test_expect_success
'remote set-url --delete .*' '
818 test_must_fail git remote set-url --delete someremote .\* &&
819 echo "YYY" >expect &&
822 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
823 echo "YYY" >>actual &&
824 git config --get-all remote.someremote.url >>actual &&
828 test_expect_success
'remote set-url --delete bbb' '
829 git remote set-url --delete someremote bbb &&
830 echo "YYY" >expect &&
832 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
833 echo "YYY" >>actual &&
834 git config --get-all remote.someremote.url >>actual &&
838 test_expect_success
'remote set-url --delete baz' '
839 test_must_fail git remote set-url --delete someremote baz &&
840 echo "YYY" >expect &&
842 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
843 echo "YYY" >>actual &&
844 git config --get-all remote.someremote.url >>actual &&
848 test_expect_success
'remote set-url --add ccc' '
849 git remote set-url --add someremote ccc &&
850 echo "YYY" >expect &&
853 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
854 echo "YYY" >>actual &&
855 git config --get-all remote.someremote.url >>actual &&
859 test_expect_success
'remote set-url --delete baz' '
860 git remote set-url --delete someremote baz &&
861 echo "YYY" >expect &&
863 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
864 echo "YYY" >>actual &&
865 git config --get-all remote.someremote.url >>actual &&