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 non-remote branches' '
114 Note: A non-remote branch was not removed; to delete it, use:
119 Note: Non-remote branches were not removed; to delete them, use:
120 git branch -d foobranch
125 git config --add remote.oops.fetch "+refs/*:refs/*" &&
126 git remote rm oops 2>actual1 &&
127 git branch foobranch &&
128 git config --add remote.oops.fetch "+refs/*:refs/*" &&
129 git remote rm oops 2>actual2 &&
130 git branch -d foobranch &&
132 test_cmp expect1 actual1 &&
133 test_cmp expect2 actual2
137 cat > test
/expect
<< EOF
139 Fetch URL: $(pwd)/one
143 master new (next fetch will store in remotes/origin)
145 Local branches configured for 'git pull':
146 ahead merges with remote master
147 master merges with remote master
148 octopus merges with remote topic-a
149 and with remote topic-b
150 and with remote topic-c
151 rebase rebases onto remote master
152 Local refs configured for 'git push':
153 master pushes to master (local out of date)
154 master pushes to upstream (create)
158 HEAD branch (remote HEAD is ambiguous, may be one of the following):
161 Local refs configured for 'git push':
162 ahead forces to master (fast-forwardable)
163 master pushes to another (up to date)
166 test_expect_success
'show' '
168 git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream &&
170 git checkout -b ahead origin/master &&
173 git commit -m update file &&
174 git checkout master &&
175 git branch --track octopus origin/master &&
176 git branch --track rebase origin/master &&
177 git branch -d -r origin/master &&
178 git config --add remote.two.url ../two &&
179 git config --add remote.two.pushurl ../three &&
180 git config branch.rebase.rebase true &&
181 git config branch.octopus.merge "topic-a topic-b topic-c" &&
185 git commit -m update file) &&
186 git config --add remote.origin.push : &&
187 git config --add remote.origin.push refs/heads/master:refs/heads/upstream &&
188 git config --add remote.origin.push +refs/tags/lastbackup &&
189 git config --add remote.two.push +refs/heads/ahead:refs/heads/master &&
190 git config --add remote.two.push refs/heads/master:refs/heads/another &&
191 git remote show origin two > output &&
192 git branch -d rebase octopus &&
193 test_cmp expect output)
196 cat > test
/expect
<< EOF
198 Fetch URL: $(pwd)/one
200 HEAD branch: (not queried)
201 Remote branches: (status not queried)
204 Local branches configured for 'git pull':
205 ahead merges with remote master
206 master merges with remote master
207 Local refs configured for 'git push' (status not queried):
208 (matching) pushes to (matching)
209 refs/heads/master pushes to refs/heads/upstream
210 refs/tags/lastbackup forces to refs/tags/lastbackup
213 test_expect_success
'show -n' '
214 (mv one one.unreachable &&
216 git remote show -n origin > output &&
217 mv ../one.unreachable ../one &&
218 test_cmp expect output)
221 test_expect_success
'prune' '
223 git branch -m side side2) &&
226 git remote prune origin &&
227 git rev-parse refs/remotes/origin/side2 &&
228 test_must_fail git rev-parse refs/remotes/origin/side)
231 test_expect_success
'set-head --delete' '
233 git symbolic-ref refs/remotes/origin/HEAD &&
234 git remote set-head --delete origin &&
235 test_must_fail git symbolic-ref refs/remotes/origin/HEAD)
238 test_expect_success
'set-head --auto' '
240 git remote set-head --auto origin &&
241 echo refs/remotes/origin/master >expect &&
242 git symbolic-ref refs/remotes/origin/HEAD >output &&
243 test_cmp expect output
247 cat >test
/expect
<<EOF
248 error: Multiple remote HEAD branches. Please choose one explicitly with:
249 git remote set-head two another
250 git remote set-head two master
253 test_expect_success
'set-head --auto fails w/multiple HEADs' '
255 test_must_fail git remote set-head --auto two >output 2>&1 &&
256 test_cmp expect output)
259 cat >test
/expect
<<EOF
260 refs/remotes/origin/side2
263 test_expect_success
'set-head explicit' '
265 git remote set-head origin side2 &&
266 git symbolic-ref refs/remotes/origin/HEAD >output &&
267 git remote set-head origin master &&
268 test_cmp expect output)
271 cat > test
/expect
<< EOF
274 * [would prune] origin/side2
277 test_expect_success
'prune --dry-run' '
279 git branch -m side2 side) &&
281 git remote prune --dry-run origin > output &&
282 git rev-parse refs/remotes/origin/side2 &&
283 test_must_fail git rev-parse refs/remotes/origin/side &&
285 git branch -m side side2) &&
286 test_cmp expect output)
289 test_expect_success
'add --mirror && prune' '
293 git remote add --mirror -f origin ../one) &&
295 git branch -m side2 side) &&
297 git rev-parse --verify refs/heads/side2 &&
298 test_must_fail git rev-parse --verify refs/heads/side &&
300 git remote prune origin &&
301 test_must_fail git rev-parse --verify refs/heads/side2 &&
302 git rev-parse --verify refs/heads/side)
305 test_expect_success
'add alt && prune' '
309 git remote add -f origin ../one &&
310 git config remote.alt.url ../one &&
311 git config remote.alt.fetch "+refs/heads/*:refs/remotes/origin/*") &&
313 git branch -m side side2) &&
315 git rev-parse --verify refs/remotes/origin/side &&
316 test_must_fail git rev-parse --verify refs/remotes/origin/side2 &&
318 git remote prune alt &&
319 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
320 git rev-parse --verify refs/remotes/origin/side2)
323 cat > one
/expect
<< EOF
331 test_expect_success
'update' '
334 git remote add drosophila ../two &&
335 git remote add apis ../mirror &&
337 git branch -r > output &&
338 test_cmp expect output)
342 cat > one
/expect
<< EOF
352 test_expect_success
'update with arguments' '
355 for b in $(git branch -r)
357 git branch -r -d $b || break
359 git remote add manduca ../mirror &&
360 git remote add megaloprepus ../mirror &&
361 git config remotes.phobaeticus "drosophila megaloprepus" &&
362 git config remotes.titanus manduca &&
363 git remote update phobaeticus titanus &&
364 git branch -r > output &&
365 test_cmp expect output)
369 test_expect_success
'update --prune' '
372 git branch -m side2 side3) &&
374 git remote update --prune &&
375 (cd ../one && git branch -m side3 side2)
376 git rev-parse refs/remotes/origin/side3 &&
377 test_must_fail git rev-parse refs/remotes/origin/side2)
380 cat > one
/expect
<< EOF
389 test_expect_success
'update default' '
392 for b in $(git branch -r)
394 git branch -r -d $b || break
396 git config remote.drosophila.skipDefaultUpdate true &&
397 git remote update default &&
398 git branch -r > output &&
399 test_cmp expect output)
403 cat > one
/expect
<< EOF
409 test_expect_success
'update default (overridden, with funny whitespace)' '
412 for b in $(git branch -r)
414 git branch -r -d $b || break
416 git config remotes.default "$(printf "\t drosophila \n")" &&
417 git remote update default &&
418 git branch -r > output &&
419 test_cmp expect output)
423 test_expect_success
'update (with remotes.default defined)' '
426 for b in $(git branch -r)
428 git branch -r -d $b || break
430 git config remotes.default "drosophila" &&
432 git branch -r > output &&
433 test_cmp expect output)
437 test_expect_success
'"remote show" does not show symbolic refs' '
439 git clone one three &&
441 git remote show origin > output &&
442 ! grep "^ *HEAD$" < output &&
443 ! grep -i stale < output)
447 test_expect_success
'reject adding remote with an invalid name' '
449 test_must_fail git remote add some:url desired-name
453 # The first three test if the tracking branches are properly renamed,
454 # the last two ones check if the config is updated.
456 test_expect_success
'rename a remote' '
458 git clone one four &&
460 git remote rename origin upstream &&
461 rmdir .git/refs/remotes/origin &&
462 test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" &&
463 test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" &&
464 test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
465 test "$(git config branch.master.remote)" = "upstream")
469 cat > remotes_origin
<< EOF
471 Push: refs/heads/master:refs/heads/upstream
472 Pull: refs/heads/master:refs/heads/origin
475 test_expect_success
'migrate a remote from named file in $GIT_DIR/remotes' '
476 git clone one five &&
477 origin_url=$(pwd)/one &&
479 git remote rm origin &&
480 mkdir -p .git/remotes &&
481 cat ../remotes_origin > .git/remotes/origin &&
482 git remote rename origin origin &&
483 ! test -f .git/remotes/origin &&
484 test "$(git config remote.origin.url)" = "$origin_url" &&
485 test "$(git config remote.origin.push)" = "refs/heads/master:refs/heads/upstream" &&
486 test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin")
489 test_expect_success
'migrate a remote from named file in $GIT_DIR/branches' '
491 origin_url=$(pwd)/one &&
493 git remote rm origin &&
494 echo "$origin_url" > .git/branches/origin &&
495 git remote rename origin origin &&
496 ! test -f .git/branches/origin &&
497 test "$(git config remote.origin.url)" = "$origin_url" &&
498 test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin")
501 test_expect_success
'remote prune to cause a dangling symref' '
502 git clone one seven &&
505 git checkout side2 &&
510 git remote prune origin
512 grep "has become dangling" err &&
514 : And the dangling symref will not cause other annoying errors &&
519 ! grep "points nowhere" err &&
522 test_must_fail git branch nomore origin
524 grep "dangling symref" err
527 test_expect_success
'show empty remote' '
529 test_create_repo empty &&
530 git clone empty empty-clone &&
533 git remote show origin
537 test_expect_success
'new remote' '
538 git remote add someremote foo &&
540 git config --get-all remote.someremote.url >actual &&
544 test_expect_success
'remote set-url bar' '
545 git remote set-url someremote bar &&
547 git config --get-all remote.someremote.url >actual &&
551 test_expect_success
'remote set-url baz bar' '
552 git remote set-url someremote baz bar &&
554 git config --get-all remote.someremote.url >actual &&
558 test_expect_success
'remote set-url zot bar' '
559 test_must_fail git remote set-url someremote zot bar &&
561 git config --get-all remote.someremote.url >actual &&
565 test_expect_success
'remote set-url --push zot baz' '
566 test_must_fail git remote set-url --push someremote zot baz &&
567 echo "YYY" >expect &&
569 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
570 echo "YYY" >>actual &&
571 git config --get-all remote.someremote.url >>actual &&
575 test_expect_success
'remote set-url --push zot' '
576 git remote set-url --push someremote zot &&
578 echo "YYY" >>expect &&
580 git config --get-all remote.someremote.pushurl >actual &&
581 echo "YYY" >>actual &&
582 git config --get-all remote.someremote.url >>actual &&
586 test_expect_success
'remote set-url --push qux zot' '
587 git remote set-url --push someremote qux zot &&
589 echo "YYY" >>expect &&
591 git config --get-all remote.someremote.pushurl >actual &&
592 echo "YYY" >>actual &&
593 git config --get-all remote.someremote.url >>actual &&
597 test_expect_success
'remote set-url --push foo qu+x' '
598 git remote set-url --push someremote foo qu+x &&
600 echo "YYY" >>expect &&
602 git config --get-all remote.someremote.pushurl >actual &&
603 echo "YYY" >>actual &&
604 git config --get-all remote.someremote.url >>actual &&
608 test_expect_success
'remote set-url --push --add aaa' '
609 git remote set-url --push --add someremote aaa &&
612 echo "YYY" >>expect &&
614 git config --get-all remote.someremote.pushurl >actual &&
615 echo "YYY" >>actual &&
616 git config --get-all remote.someremote.url >>actual &&
620 test_expect_success
'remote set-url --push bar aaa' '
621 git remote set-url --push someremote bar aaa &&
624 echo "YYY" >>expect &&
626 git config --get-all remote.someremote.pushurl >actual &&
627 echo "YYY" >>actual &&
628 git config --get-all remote.someremote.url >>actual &&
632 test_expect_success
'remote set-url --push --delete bar' '
633 git remote set-url --push --delete someremote bar &&
635 echo "YYY" >>expect &&
637 git config --get-all remote.someremote.pushurl >actual &&
638 echo "YYY" >>actual &&
639 git config --get-all remote.someremote.url >>actual &&
643 test_expect_success
'remote set-url --push --delete foo' '
644 git remote set-url --push --delete someremote foo &&
645 echo "YYY" >expect &&
647 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
648 echo "YYY" >>actual &&
649 git config --get-all remote.someremote.url >>actual &&
653 test_expect_success
'remote set-url --add bbb' '
654 git remote set-url --add someremote bbb &&
655 echo "YYY" >expect &&
658 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
659 echo "YYY" >>actual &&
660 git config --get-all remote.someremote.url >>actual &&
664 test_expect_success
'remote set-url --delete .*' '
665 test_must_fail git remote set-url --delete someremote .\* &&
666 echo "YYY" >expect &&
669 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
670 echo "YYY" >>actual &&
671 git config --get-all remote.someremote.url >>actual &&
675 test_expect_success
'remote set-url --delete bbb' '
676 git remote set-url --delete someremote bbb &&
677 echo "YYY" >expect &&
679 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
680 echo "YYY" >>actual &&
681 git config --get-all remote.someremote.url >>actual &&
685 test_expect_success
'remote set-url --delete baz' '
686 test_must_fail git remote set-url --delete someremote baz &&
687 echo "YYY" >expect &&
689 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
690 echo "YYY" >>actual &&
691 git config --get-all remote.someremote.url >>actual &&
695 test_expect_success
'remote set-url --add ccc' '
696 git remote set-url --add someremote ccc &&
697 echo "YYY" >expect &&
700 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
701 echo "YYY" >>actual &&
702 git config --get-all remote.someremote.url >>actual &&
706 test_expect_success
'remote set-url --delete baz' '
707 git remote set-url --delete someremote baz &&
708 echo "YYY" >expect &&
710 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
711 echo "YYY" >>actual &&
712 git config --get-all remote.someremote.url >>actual &&