merge-recursive: demonstrate an incorrect conflict with submodule
[git/dscho.git] / t / t5505-remote.sh
blob41f17e76939ff0470878018cfbc11b45a8e92137
1 #!/bin/sh
3 test_description='git remote porcelain-ish'
5 . ./test-lib.sh
7 setup_repository () {
8 mkdir "$1" && (
9 cd "$1" &&
10 git init &&
11 >file &&
12 git add file &&
13 test_tick &&
14 git commit -m "Initial" &&
15 git checkout -b side &&
16 >elif &&
17 git add elif &&
18 test_tick &&
19 git commit -m "Second" &&
20 git checkout master
24 tokens_match () {
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')
32 shift &&
33 tokens_match "$*" "$actual"
36 check_tracking_branch () {
37 f="" &&
38 r=$(git for-each-ref "--format=%(refname)" |
39 sed -ne "s|^refs/remotes/$1/||p") &&
40 shift &&
41 tokens_match "$*" "$r"
44 test_expect_success setup '
46 setup_repository one &&
47 setup_repository two &&
49 cd two && git branch another
50 ) &&
51 git clone one test
55 test_expect_success 'remote information for the origin' '
57 cd test &&
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' '
66 cd test &&
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 &&
75 >expect &&
76 test_cmp expect actual
80 test_expect_success 'remote forces tracking branches' '
82 cd test &&
83 case `git config remote.second.fetch` in
84 +*) true ;;
85 *) false ;;
86 esac
90 test_expect_success 'remove remote' '
92 cd test &&
93 git symbolic-ref refs/remotes/second/HEAD refs/remotes/second/master &&
94 git remote rm second
98 test_expect_success 'remove remote' '
100 cd test &&
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 &&
105 >expect &&
106 test_cmp expect actual
110 test_expect_success 'remove remote protects non-remote branches' '
112 cd test &&
113 { cat >expect1 <<EOF
114 Note: A non-remote branch was not removed; to delete it, use:
115 git branch -d master
117 } &&
118 { cat >expect2 <<EOF
119 Note: Non-remote branches were not removed; to delete them, use:
120 git branch -d foobranch
121 git branch -d master
123 } &&
124 git tag footag &&
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 &&
131 git tag -d footag &&
132 test_cmp expect1 actual1 &&
133 test_cmp expect2 actual2
137 cat > test/expect << EOF
138 * remote origin
139 Fetch URL: $(pwd)/one
140 Push URL: $(pwd)/one
141 HEAD branch: master
142 Remote branches:
143 master new (next fetch will store in remotes/origin)
144 side tracked
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)
155 * remote two
156 Fetch URL: ../two
157 Push URL: ../three
158 HEAD branch (remote HEAD is ambiguous, may be one of the following):
159 another
160 master
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' '
167 (cd test &&
168 git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream &&
169 git fetch &&
170 git checkout -b ahead origin/master &&
171 echo 1 >> file &&
172 test_tick &&
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" &&
182 (cd ../one &&
183 echo 1 > file &&
184 test_tick &&
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
197 * remote origin
198 Fetch URL: $(pwd)/one
199 Push URL: $(pwd)/one
200 HEAD branch: (not queried)
201 Remote branches: (status not queried)
202 master
203 side
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 &&
215 cd test &&
216 git remote show -n origin > output &&
217 mv ../one.unreachable ../one &&
218 test_cmp expect output)
221 test_expect_success 'prune' '
222 (cd one &&
223 git branch -m side side2) &&
224 (cd test &&
225 git fetch origin &&
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' '
232 (cd test &&
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' '
239 (cd test &&
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' '
254 (cd test &&
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' '
264 (cd test &&
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
272 Pruning origin
273 URL: $(pwd)/one
274 * [would prune] origin/side2
277 test_expect_success 'prune --dry-run' '
278 (cd one &&
279 git branch -m side2 side) &&
280 (cd test &&
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 &&
284 (cd ../one &&
285 git branch -m side side2) &&
286 test_cmp expect output)
289 test_expect_success 'add --mirror && prune' '
290 (mkdir mirror &&
291 cd mirror &&
292 git init --bare &&
293 git remote add --mirror -f origin ../one) &&
294 (cd one &&
295 git branch -m side2 side) &&
296 (cd mirror &&
297 git rev-parse --verify refs/heads/side2 &&
298 test_must_fail git rev-parse --verify refs/heads/side &&
299 git fetch origin &&
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' '
306 (mkdir alttst &&
307 cd alttst &&
308 git init &&
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/*") &&
312 (cd one &&
313 git branch -m side side2) &&
314 (cd alttst &&
315 git rev-parse --verify refs/remotes/origin/side &&
316 test_must_fail git rev-parse --verify refs/remotes/origin/side2 &&
317 git fetch alt &&
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 >test/expect <<\EOF
324 some-tag
327 test_expect_success 'add with reachable tags (default)' '
328 (cd one &&
329 >foobar &&
330 git add foobar &&
331 git commit -m "Foobar" &&
332 git tag -a -m "Foobar tag" foobar-tag &&
333 git reset --hard HEAD~1 &&
334 git tag -a -m "Some tag" some-tag) &&
335 (mkdir add-tags &&
336 cd add-tags &&
337 git init &&
338 git remote add -f origin ../one &&
339 git tag -l some-tag >../test/output &&
340 git tag -l foobar-tag >>../test/output &&
341 test_must_fail git config remote.origin.tagopt) &&
342 test_cmp test/expect test/output
345 cat >test/expect <<\EOF
346 some-tag
347 foobar-tag
348 --tags
351 test_expect_success 'add --tags' '
352 (rm -rf add-tags &&
353 mkdir add-tags &&
354 cd add-tags &&
355 git init &&
356 git remote add -f --tags origin ../one &&
357 git tag -l some-tag >../test/output &&
358 git tag -l foobar-tag >>../test/output &&
359 git config remote.origin.tagopt >>../test/output) &&
360 test_cmp test/expect test/output
363 cat >test/expect <<\EOF
364 --no-tags
367 test_expect_success 'add --no-tags' '
368 (rm -rf add-tags &&
369 mkdir add-no-tags &&
370 cd add-no-tags &&
371 git init &&
372 git remote add -f --no-tags origin ../one &&
373 git tag -l some-tag >../test/output &&
374 git tag -l foobar-tag >../test/output &&
375 git config remote.origin.tagopt >>../test/output) &&
376 (cd one &&
377 git tag -d some-tag foobar-tag) &&
378 test_cmp test/expect test/output
381 test_expect_success 'reject --no-no-tags' '
382 (cd add-no-tags &&
383 test_must_fail git remote add -f --no-no-tags neworigin ../one)
386 cat > one/expect << EOF
387 apis/master
388 apis/side
389 drosophila/another
390 drosophila/master
391 drosophila/side
394 test_expect_success 'update' '
396 (cd one &&
397 git remote add drosophila ../two &&
398 git remote add apis ../mirror &&
399 git remote update &&
400 git branch -r > output &&
401 test_cmp expect output)
405 cat > one/expect << EOF
406 drosophila/another
407 drosophila/master
408 drosophila/side
409 manduca/master
410 manduca/side
411 megaloprepus/master
412 megaloprepus/side
415 test_expect_success 'update with arguments' '
417 (cd one &&
418 for b in $(git branch -r)
420 git branch -r -d $b || break
421 done &&
422 git remote add manduca ../mirror &&
423 git remote add megaloprepus ../mirror &&
424 git config remotes.phobaeticus "drosophila megaloprepus" &&
425 git config remotes.titanus manduca &&
426 git remote update phobaeticus titanus &&
427 git branch -r > output &&
428 test_cmp expect output)
432 test_expect_success 'update --prune' '
434 (cd one &&
435 git branch -m side2 side3) &&
436 (cd test &&
437 git remote update --prune &&
438 (cd ../one && git branch -m side3 side2)
439 git rev-parse refs/remotes/origin/side3 &&
440 test_must_fail git rev-parse refs/remotes/origin/side2)
443 cat > one/expect << EOF
444 apis/master
445 apis/side
446 manduca/master
447 manduca/side
448 megaloprepus/master
449 megaloprepus/side
452 test_expect_success 'update default' '
454 (cd one &&
455 for b in $(git branch -r)
457 git branch -r -d $b || break
458 done &&
459 git config remote.drosophila.skipDefaultUpdate true &&
460 git remote update default &&
461 git branch -r > output &&
462 test_cmp expect output)
466 cat > one/expect << EOF
467 drosophila/another
468 drosophila/master
469 drosophila/side
472 test_expect_success 'update default (overridden, with funny whitespace)' '
474 (cd one &&
475 for b in $(git branch -r)
477 git branch -r -d $b || break
478 done &&
479 git config remotes.default "$(printf "\t drosophila \n")" &&
480 git remote update default &&
481 git branch -r > output &&
482 test_cmp expect output)
486 test_expect_success 'update (with remotes.default defined)' '
488 (cd one &&
489 for b in $(git branch -r)
491 git branch -r -d $b || break
492 done &&
493 git config remotes.default "drosophila" &&
494 git remote update &&
495 git branch -r > output &&
496 test_cmp expect output)
500 test_expect_success '"remote show" does not show symbolic refs' '
502 git clone one three &&
503 (cd three &&
504 git remote show origin > output &&
505 ! grep "^ *HEAD$" < output &&
506 ! grep -i stale < output)
510 test_expect_success 'reject adding remote with an invalid name' '
512 test_must_fail git remote add some:url desired-name
516 # The first three test if the tracking branches are properly renamed,
517 # the last two ones check if the config is updated.
519 test_expect_success 'rename a remote' '
521 git clone one four &&
522 (cd four &&
523 git remote rename origin upstream &&
524 rmdir .git/refs/remotes/origin &&
525 test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" &&
526 test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" &&
527 test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
528 test "$(git config branch.master.remote)" = "upstream")
532 cat > remotes_origin << EOF
533 URL: $(pwd)/one
534 Push: refs/heads/master:refs/heads/upstream
535 Pull: refs/heads/master:refs/heads/origin
538 test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' '
539 git clone one five &&
540 origin_url=$(pwd)/one &&
541 (cd five &&
542 git remote rm origin &&
543 mkdir -p .git/remotes &&
544 cat ../remotes_origin > .git/remotes/origin &&
545 git remote rename origin origin &&
546 ! test -f .git/remotes/origin &&
547 test "$(git config remote.origin.url)" = "$origin_url" &&
548 test "$(git config remote.origin.push)" = "refs/heads/master:refs/heads/upstream" &&
549 test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin")
552 test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' '
553 git clone one six &&
554 origin_url=$(pwd)/one &&
555 (cd six &&
556 git remote rm origin &&
557 echo "$origin_url" > .git/branches/origin &&
558 git remote rename origin origin &&
559 ! test -f .git/branches/origin &&
560 test "$(git config remote.origin.url)" = "$origin_url" &&
561 test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin")
564 test_expect_success 'remote prune to cause a dangling symref' '
565 git clone one seven &&
567 cd one &&
568 git checkout side2 &&
569 git branch -D master
570 ) &&
572 cd seven &&
573 git remote prune origin
574 ) >err 2>&1 &&
575 grep "has become dangling" err &&
577 : And the dangling symref will not cause other annoying errors &&
579 cd seven &&
580 git branch -a
581 ) 2>err &&
582 ! grep "points nowhere" err &&
584 cd seven &&
585 test_must_fail git branch nomore origin
586 ) 2>err &&
587 grep "dangling symref" err
590 test_expect_success 'show empty remote' '
592 test_create_repo empty &&
593 git clone empty empty-clone &&
595 cd empty-clone &&
596 git remote show origin
600 test_expect_success 'new remote' '
601 git remote add someremote foo &&
602 echo foo >expect &&
603 git config --get-all remote.someremote.url >actual &&
604 cmp expect actual
607 test_expect_success 'remote set-url bar' '
608 git remote set-url someremote bar &&
609 echo bar >expect &&
610 git config --get-all remote.someremote.url >actual &&
611 cmp expect actual
614 test_expect_success 'remote set-url baz bar' '
615 git remote set-url someremote baz bar &&
616 echo baz >expect &&
617 git config --get-all remote.someremote.url >actual &&
618 cmp expect actual
621 test_expect_success 'remote set-url zot bar' '
622 test_must_fail git remote set-url someremote zot bar &&
623 echo baz >expect &&
624 git config --get-all remote.someremote.url >actual &&
625 cmp expect actual
628 test_expect_success 'remote set-url --push zot baz' '
629 test_must_fail git remote set-url --push someremote zot baz &&
630 echo "YYY" >expect &&
631 echo baz >>expect &&
632 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
633 echo "YYY" >>actual &&
634 git config --get-all remote.someremote.url >>actual &&
635 cmp expect actual
638 test_expect_success 'remote set-url --push zot' '
639 git remote set-url --push someremote zot &&
640 echo zot >expect &&
641 echo "YYY" >>expect &&
642 echo baz >>expect &&
643 git config --get-all remote.someremote.pushurl >actual &&
644 echo "YYY" >>actual &&
645 git config --get-all remote.someremote.url >>actual &&
646 cmp expect actual
649 test_expect_success 'remote set-url --push qux zot' '
650 git remote set-url --push someremote qux zot &&
651 echo qux >expect &&
652 echo "YYY" >>expect &&
653 echo baz >>expect &&
654 git config --get-all remote.someremote.pushurl >actual &&
655 echo "YYY" >>actual &&
656 git config --get-all remote.someremote.url >>actual &&
657 cmp expect actual
660 test_expect_success 'remote set-url --push foo qu+x' '
661 git remote set-url --push someremote foo qu+x &&
662 echo foo >expect &&
663 echo "YYY" >>expect &&
664 echo baz >>expect &&
665 git config --get-all remote.someremote.pushurl >actual &&
666 echo "YYY" >>actual &&
667 git config --get-all remote.someremote.url >>actual &&
668 cmp expect actual
671 test_expect_success 'remote set-url --push --add aaa' '
672 git remote set-url --push --add someremote aaa &&
673 echo foo >expect &&
674 echo aaa >>expect &&
675 echo "YYY" >>expect &&
676 echo baz >>expect &&
677 git config --get-all remote.someremote.pushurl >actual &&
678 echo "YYY" >>actual &&
679 git config --get-all remote.someremote.url >>actual &&
680 cmp expect actual
683 test_expect_success 'remote set-url --push bar aaa' '
684 git remote set-url --push someremote bar aaa &&
685 echo foo >expect &&
686 echo bar >>expect &&
687 echo "YYY" >>expect &&
688 echo baz >>expect &&
689 git config --get-all remote.someremote.pushurl >actual &&
690 echo "YYY" >>actual &&
691 git config --get-all remote.someremote.url >>actual &&
692 cmp expect actual
695 test_expect_success 'remote set-url --push --delete bar' '
696 git remote set-url --push --delete someremote bar &&
697 echo foo >expect &&
698 echo "YYY" >>expect &&
699 echo baz >>expect &&
700 git config --get-all remote.someremote.pushurl >actual &&
701 echo "YYY" >>actual &&
702 git config --get-all remote.someremote.url >>actual &&
703 cmp expect actual
706 test_expect_success 'remote set-url --push --delete foo' '
707 git remote set-url --push --delete someremote foo &&
708 echo "YYY" >expect &&
709 echo baz >>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 &&
713 cmp expect actual
716 test_expect_success 'remote set-url --add bbb' '
717 git remote set-url --add someremote bbb &&
718 echo "YYY" >expect &&
719 echo baz >>expect &&
720 echo bbb >>expect &&
721 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
722 echo "YYY" >>actual &&
723 git config --get-all remote.someremote.url >>actual &&
724 cmp expect actual
727 test_expect_success 'remote set-url --delete .*' '
728 test_must_fail git remote set-url --delete someremote .\* &&
729 echo "YYY" >expect &&
730 echo baz >>expect &&
731 echo bbb >>expect &&
732 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
733 echo "YYY" >>actual &&
734 git config --get-all remote.someremote.url >>actual &&
735 cmp expect actual
738 test_expect_success 'remote set-url --delete bbb' '
739 git remote set-url --delete someremote bbb &&
740 echo "YYY" >expect &&
741 echo baz >>expect &&
742 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
743 echo "YYY" >>actual &&
744 git config --get-all remote.someremote.url >>actual &&
745 cmp expect actual
748 test_expect_success 'remote set-url --delete baz' '
749 test_must_fail git remote set-url --delete someremote baz &&
750 echo "YYY" >expect &&
751 echo baz >>expect &&
752 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
753 echo "YYY" >>actual &&
754 git config --get-all remote.someremote.url >>actual &&
755 cmp expect actual
758 test_expect_success 'remote set-url --add ccc' '
759 git remote set-url --add someremote ccc &&
760 echo "YYY" >expect &&
761 echo baz >>expect &&
762 echo ccc >>expect &&
763 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
764 echo "YYY" >>actual &&
765 git config --get-all remote.someremote.url >>actual &&
766 cmp expect actual
769 test_expect_success 'remote set-url --delete baz' '
770 git remote set-url --delete someremote baz &&
771 echo "YYY" >expect &&
772 echo ccc >>expect &&
773 test_must_fail git config --get-all remote.someremote.pushurl >actual &&
774 echo "YYY" >>actual &&
775 git config --get-all remote.someremote.url >>actual &&
776 cmp expect actual
779 test_done