merge-recursive: demonstrate an incorrect conflict with submodule
[git/dscho.git] / t / t5516-fetch-push.sh
blobb11da79c9cafebb5af572bd8e9f85dfc6f3c3f77
1 #!/bin/sh
3 test_description='fetching and pushing, with or without wildcard'
5 . ./test-lib.sh
7 D=`pwd`
9 mk_empty () {
10 rm -fr testrepo &&
11 mkdir testrepo &&
13 cd testrepo &&
14 git init &&
15 git config receive.denyCurrentBranch warn &&
16 mv .git/hooks .git/hooks-disabled
20 mk_test () {
21 mk_empty &&
23 for ref in "$@"
25 git push testrepo $the_first_commit:refs/$ref || {
26 echo "Oops, push refs/$ref failure"
27 exit 1
29 done &&
30 cd testrepo &&
31 for ref in "$@"
33 r=$(git show-ref -s --verify refs/$ref) &&
34 test "z$r" = "z$the_first_commit" || {
35 echo "Oops, refs/$ref is wrong"
36 exit 1
38 done &&
39 git fsck --full
43 mk_child() {
44 rm -rf "$1" &&
45 git clone testrepo "$1"
48 check_push_result () {
50 cd testrepo &&
51 it="$1" &&
52 shift
53 for ref in "$@"
55 r=$(git show-ref -s --verify refs/$ref) &&
56 test "z$r" = "z$it" || {
57 echo "Oops, refs/$ref is wrong"
58 exit 1
60 done &&
61 git fsck --full
65 test_expect_success setup '
67 >path1 &&
68 git add path1 &&
69 test_tick &&
70 git commit -a -m repo &&
71 the_first_commit=$(git show-ref -s --verify refs/heads/master) &&
73 >path2 &&
74 git add path2 &&
75 test_tick &&
76 git commit -a -m second &&
77 the_commit=$(git show-ref -s --verify refs/heads/master)
81 test_expect_success 'fetch without wildcard' '
82 mk_empty &&
84 cd testrepo &&
85 git fetch .. refs/heads/master:refs/remotes/origin/master &&
87 r=$(git show-ref -s --verify refs/remotes/origin/master) &&
88 test "z$r" = "z$the_commit" &&
90 test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
94 test_expect_success 'fetch with wildcard' '
95 mk_empty &&
97 cd testrepo &&
98 git config remote.up.url .. &&
99 git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
100 git fetch up &&
102 r=$(git show-ref -s --verify refs/remotes/origin/master) &&
103 test "z$r" = "z$the_commit" &&
105 test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
109 test_expect_success 'fetch with insteadOf' '
110 mk_empty &&
112 TRASH=$(pwd)/ &&
113 cd testrepo &&
114 git config "url.$TRASH.insteadOf" trash/ &&
115 git config remote.up.url trash/. &&
116 git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
117 git fetch up &&
119 r=$(git show-ref -s --verify refs/remotes/origin/master) &&
120 test "z$r" = "z$the_commit" &&
122 test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
126 test_expect_success 'fetch with pushInsteadOf (should not rewrite)' '
127 mk_empty &&
129 TRASH=$(pwd)/ &&
130 cd testrepo &&
131 git config "url.trash/.pushInsteadOf" "$TRASH" &&
132 git config remote.up.url "$TRASH." &&
133 git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
134 git fetch up &&
136 r=$(git show-ref -s --verify refs/remotes/origin/master) &&
137 test "z$r" = "z$the_commit" &&
139 test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
143 test_expect_success 'push without wildcard' '
144 mk_empty &&
146 git push testrepo refs/heads/master:refs/remotes/origin/master &&
148 cd testrepo &&
149 r=$(git show-ref -s --verify refs/remotes/origin/master) &&
150 test "z$r" = "z$the_commit" &&
152 test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
156 test_expect_success 'push with wildcard' '
157 mk_empty &&
159 git push testrepo "refs/heads/*:refs/remotes/origin/*" &&
161 cd testrepo &&
162 r=$(git show-ref -s --verify refs/remotes/origin/master) &&
163 test "z$r" = "z$the_commit" &&
165 test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
169 test_expect_success 'push with insteadOf' '
170 mk_empty &&
171 TRASH="$(pwd)/" &&
172 git config "url.$TRASH.insteadOf" trash/ &&
173 git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
175 cd testrepo &&
176 r=$(git show-ref -s --verify refs/remotes/origin/master) &&
177 test "z$r" = "z$the_commit" &&
179 test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
183 test_expect_success 'push with pushInsteadOf' '
184 mk_empty &&
185 TRASH="$(pwd)/" &&
186 git config "url.$TRASH.pushInsteadOf" trash/ &&
187 git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
189 cd testrepo &&
190 r=$(git show-ref -s --verify refs/remotes/origin/master) &&
191 test "z$r" = "z$the_commit" &&
193 test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
197 test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' '
198 mk_empty &&
199 TRASH="$(pwd)/" &&
200 git config "url.trash2/.pushInsteadOf" trash/ &&
201 git config remote.r.url trash/wrong &&
202 git config remote.r.pushurl "$TRASH/testrepo" &&
203 git push r refs/heads/master:refs/remotes/origin/master &&
205 cd testrepo &&
206 r=$(git show-ref -s --verify refs/remotes/origin/master) &&
207 test "z$r" = "z$the_commit" &&
209 test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
213 test_expect_success 'push with matching heads' '
215 mk_test heads/master &&
216 git push testrepo &&
217 check_push_result $the_commit heads/master
221 test_expect_success 'push with matching heads on the command line' '
223 mk_test heads/master &&
224 git push testrepo : &&
225 check_push_result $the_commit heads/master
229 test_expect_success 'failed (non-fast-forward) push with matching heads' '
231 mk_test heads/master &&
232 git push testrepo : &&
233 git commit --amend -massaged &&
234 test_must_fail git push testrepo &&
235 check_push_result $the_commit heads/master &&
236 git reset --hard $the_commit
240 test_expect_success 'push --force with matching heads' '
242 mk_test heads/master &&
243 git push testrepo : &&
244 git commit --amend -massaged &&
245 git push --force testrepo &&
246 ! check_push_result $the_commit heads/master &&
247 git reset --hard $the_commit
251 test_expect_success 'push with matching heads and forced update' '
253 mk_test heads/master &&
254 git push testrepo : &&
255 git commit --amend -massaged &&
256 git push testrepo +: &&
257 ! check_push_result $the_commit heads/master &&
258 git reset --hard $the_commit
262 test_expect_success 'push with no ambiguity (1)' '
264 mk_test heads/master &&
265 git push testrepo master:master &&
266 check_push_result $the_commit heads/master
270 test_expect_success 'push with no ambiguity (2)' '
272 mk_test remotes/origin/master &&
273 git push testrepo master:origin/master &&
274 check_push_result $the_commit remotes/origin/master
278 test_expect_success 'push with colon-less refspec, no ambiguity' '
280 mk_test heads/master heads/t/master &&
281 git branch -f t/master master &&
282 git push testrepo master &&
283 check_push_result $the_commit heads/master &&
284 check_push_result $the_first_commit heads/t/master
288 test_expect_success 'push with weak ambiguity (1)' '
290 mk_test heads/master remotes/origin/master &&
291 git push testrepo master:master &&
292 check_push_result $the_commit heads/master &&
293 check_push_result $the_first_commit remotes/origin/master
297 test_expect_success 'push with weak ambiguity (2)' '
299 mk_test heads/master remotes/origin/master remotes/another/master &&
300 git push testrepo master:master &&
301 check_push_result $the_commit heads/master &&
302 check_push_result $the_first_commit remotes/origin/master remotes/another/master
306 test_expect_success 'push with ambiguity' '
308 mk_test heads/frotz tags/frotz &&
309 if git push testrepo master:frotz
310 then
311 echo "Oops, should have failed"
312 false
313 else
314 check_push_result $the_first_commit heads/frotz tags/frotz
319 test_expect_success 'push with colon-less refspec (1)' '
321 mk_test heads/frotz tags/frotz &&
322 git branch -f frotz master &&
323 git push testrepo frotz &&
324 check_push_result $the_commit heads/frotz &&
325 check_push_result $the_first_commit tags/frotz
329 test_expect_success 'push with colon-less refspec (2)' '
331 mk_test heads/frotz tags/frotz &&
332 if git show-ref --verify -q refs/heads/frotz
333 then
334 git branch -D frotz
335 fi &&
336 git tag -f frotz &&
337 git push testrepo frotz &&
338 check_push_result $the_commit tags/frotz &&
339 check_push_result $the_first_commit heads/frotz
343 test_expect_success 'push with colon-less refspec (3)' '
345 mk_test &&
346 if git show-ref --verify -q refs/tags/frotz
347 then
348 git tag -d frotz
349 fi &&
350 git branch -f frotz master &&
351 git push testrepo frotz &&
352 check_push_result $the_commit heads/frotz &&
353 test 1 = $( cd testrepo && git show-ref | wc -l )
356 test_expect_success 'push with colon-less refspec (4)' '
358 mk_test &&
359 if git show-ref --verify -q refs/heads/frotz
360 then
361 git branch -D frotz
362 fi &&
363 git tag -f frotz &&
364 git push testrepo frotz &&
365 check_push_result $the_commit tags/frotz &&
366 test 1 = $( cd testrepo && git show-ref | wc -l )
370 test_expect_success 'push head with non-existant, incomplete dest' '
372 mk_test &&
373 git push testrepo master:branch &&
374 check_push_result $the_commit heads/branch
378 test_expect_success 'push tag with non-existant, incomplete dest' '
380 mk_test &&
381 git tag -f v1.0 &&
382 git push testrepo v1.0:tag &&
383 check_push_result $the_commit tags/tag
387 test_expect_success 'push sha1 with non-existant, incomplete dest' '
389 mk_test &&
390 test_must_fail git push testrepo `git rev-parse master`:foo
394 test_expect_success 'push ref expression with non-existant, incomplete dest' '
396 mk_test &&
397 test_must_fail git push testrepo master^:branch
401 test_expect_success 'push with HEAD' '
403 mk_test heads/master &&
404 git checkout master &&
405 git push testrepo HEAD &&
406 check_push_result $the_commit heads/master
410 test_expect_success 'push with HEAD nonexisting at remote' '
412 mk_test heads/master &&
413 git checkout -b local master &&
414 git push testrepo HEAD &&
415 check_push_result $the_commit heads/local
418 test_expect_success 'push with +HEAD' '
420 mk_test heads/master &&
421 git checkout master &&
422 git branch -D local &&
423 git checkout -b local &&
424 git push testrepo master local &&
425 check_push_result $the_commit heads/master &&
426 check_push_result $the_commit heads/local &&
428 # Without force rewinding should fail
429 git reset --hard HEAD^ &&
430 test_must_fail git push testrepo HEAD &&
431 check_push_result $the_commit heads/local &&
433 # With force rewinding should succeed
434 git push testrepo +HEAD &&
435 check_push_result $the_first_commit heads/local
439 test_expect_success 'push HEAD with non-existant, incomplete dest' '
441 mk_test &&
442 git checkout master &&
443 git push testrepo HEAD:branch &&
444 check_push_result $the_commit heads/branch
448 test_expect_success 'push with config remote.*.push = HEAD' '
450 mk_test heads/local &&
451 git checkout master &&
452 git branch -f local $the_commit &&
454 cd testrepo &&
455 git checkout local &&
456 git reset --hard $the_first_commit
457 ) &&
458 git config remote.there.url testrepo &&
459 git config remote.there.push HEAD &&
460 git config branch.master.remote there &&
461 git push &&
462 check_push_result $the_commit heads/master &&
463 check_push_result $the_first_commit heads/local
466 # clean up the cruft left with the previous one
467 git config --remove-section remote.there
468 git config --remove-section branch.master
470 test_expect_success 'push with config remote.*.pushurl' '
472 mk_test heads/master &&
473 git checkout master &&
474 git config remote.there.url test2repo &&
475 git config remote.there.pushurl testrepo &&
476 git push there &&
477 check_push_result $the_commit heads/master
480 # clean up the cruft left with the previous one
481 git config --remove-section remote.there
483 test_expect_success 'push with dry-run' '
485 mk_test heads/master &&
487 cd testrepo &&
488 old_commit=$(git show-ref -s --verify refs/heads/master)
489 ) &&
490 git push --dry-run testrepo &&
491 check_push_result $old_commit heads/master
494 test_expect_success 'push updates local refs' '
496 mk_test heads/master &&
497 mk_child child &&
499 cd child &&
500 git pull .. master &&
501 git push &&
502 test $(git rev-parse master) = \
503 $(git rev-parse remotes/origin/master)
508 test_expect_success 'push updates up-to-date local refs' '
510 mk_test heads/master &&
511 mk_child child1 &&
512 mk_child child2 &&
513 (cd child1 && git pull .. master && git push) &&
515 cd child2 &&
516 git pull ../child1 master &&
517 git push &&
518 test $(git rev-parse master) = \
519 $(git rev-parse remotes/origin/master)
524 test_expect_success 'push preserves up-to-date packed refs' '
526 mk_test heads/master &&
527 mk_child child &&
529 cd child &&
530 git push &&
531 ! test -f .git/refs/remotes/origin/master
536 test_expect_success 'push does not update local refs on failure' '
538 mk_test heads/master &&
539 mk_child child &&
540 mkdir testrepo/.git/hooks &&
541 echo "#!/no/frobnication/today" >testrepo/.git/hooks/pre-receive &&
542 chmod +x testrepo/.git/hooks/pre-receive &&
544 cd child &&
545 git pull .. master
546 test_must_fail git push &&
547 test $(git rev-parse master) != \
548 $(git rev-parse remotes/origin/master)
553 test_expect_success 'allow deleting an invalid remote ref' '
555 mk_test heads/master &&
556 rm -f testrepo/.git/objects/??/* &&
557 git push testrepo :refs/heads/master &&
558 (cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
562 test_expect_success 'allow deleting a ref using --delete' '
563 mk_test heads/master &&
564 (cd testrepo && git config receive.denyDeleteCurrent warn) &&
565 git push testrepo --delete master &&
566 (cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
569 test_expect_success 'allow deleting a tag using --delete' '
570 mk_test heads/master &&
571 git tag -a -m dummy_message deltag heads/master &&
572 git push testrepo --tags &&
573 (cd testrepo && git rev-parse --verify -q refs/tags/deltag) &&
574 git push testrepo --delete tag deltag &&
575 (cd testrepo && test_must_fail git rev-parse --verify refs/tags/deltag)
578 test_expect_success 'push --delete without args aborts' '
579 mk_test heads/master &&
580 test_must_fail git push testrepo --delete
583 test_expect_success 'push --delete refuses src:dest refspecs' '
584 mk_test heads/master &&
585 test_must_fail git push testrepo --delete master:foo
588 test_expect_success 'warn on push to HEAD of non-bare repository' '
589 mk_test heads/master
591 cd testrepo &&
592 git checkout master &&
593 git config receive.denyCurrentBranch warn
594 ) &&
595 git push testrepo master 2>stderr &&
596 grep "warning: updating the current branch" stderr
599 test_expect_success 'deny push to HEAD of non-bare repository' '
600 mk_test heads/master
602 cd testrepo &&
603 git checkout master &&
604 git config receive.denyCurrentBranch true
605 ) &&
606 test_must_fail git push testrepo master
609 test_expect_success 'allow push to HEAD of bare repository (bare)' '
610 mk_test heads/master
612 cd testrepo &&
613 git checkout master &&
614 git config receive.denyCurrentBranch true &&
615 git config core.bare true
616 ) &&
617 git push testrepo master 2>stderr &&
618 ! grep "warning: updating the current branch" stderr
621 test_expect_success 'allow push to HEAD of non-bare repository (config)' '
622 mk_test heads/master
624 cd testrepo &&
625 git checkout master &&
626 git config receive.denyCurrentBranch false
627 ) &&
628 git push testrepo master 2>stderr &&
629 ! grep "warning: updating the current branch" stderr
632 test_expect_success 'fetch with branches' '
633 mk_empty &&
634 git branch second $the_first_commit &&
635 git checkout second &&
636 echo ".." > testrepo/.git/branches/branch1 &&
638 cd testrepo &&
639 git fetch branch1 &&
640 r=$(git show-ref -s --verify refs/heads/branch1) &&
641 test "z$r" = "z$the_commit" &&
642 test 1 = $(git for-each-ref refs/heads | wc -l)
643 ) &&
644 git checkout master
647 test_expect_success 'fetch with branches containing #' '
648 mk_empty &&
649 echo "..#second" > testrepo/.git/branches/branch2 &&
651 cd testrepo &&
652 git fetch branch2 &&
653 r=$(git show-ref -s --verify refs/heads/branch2) &&
654 test "z$r" = "z$the_first_commit" &&
655 test 1 = $(git for-each-ref refs/heads | wc -l)
656 ) &&
657 git checkout master
660 test_expect_success 'push with branches' '
661 mk_empty &&
662 git checkout second &&
663 echo "testrepo" > .git/branches/branch1 &&
664 git push branch1 &&
666 cd testrepo &&
667 r=$(git show-ref -s --verify refs/heads/master) &&
668 test "z$r" = "z$the_first_commit" &&
669 test 1 = $(git for-each-ref refs/heads | wc -l)
673 test_expect_success 'push with branches containing #' '
674 mk_empty &&
675 echo "testrepo#branch3" > .git/branches/branch2 &&
676 git push branch2 &&
678 cd testrepo &&
679 r=$(git show-ref -s --verify refs/heads/branch3) &&
680 test "z$r" = "z$the_first_commit" &&
681 test 1 = $(git for-each-ref refs/heads | wc -l)
682 ) &&
683 git checkout master
686 test_expect_success 'push into aliased refs (consistent)' '
687 mk_test heads/master &&
688 mk_child child1 &&
689 mk_child child2 &&
691 cd child1 &&
692 git branch foo &&
693 git symbolic-ref refs/heads/bar refs/heads/foo
694 git config receive.denyCurrentBranch false
695 ) &&
697 cd child2 &&
698 >path2 &&
699 git add path2 &&
700 test_tick &&
701 git commit -a -m child2 &&
702 git branch foo &&
703 git branch bar &&
704 git push ../child1 foo bar
708 test_expect_success 'push into aliased refs (inconsistent)' '
709 mk_test heads/master &&
710 mk_child child1 &&
711 mk_child child2 &&
713 cd child1 &&
714 git branch foo &&
715 git symbolic-ref refs/heads/bar refs/heads/foo
716 git config receive.denyCurrentBranch false
717 ) &&
719 cd child2 &&
720 >path2 &&
721 git add path2 &&
722 test_tick &&
723 git commit -a -m child2 &&
724 git branch foo &&
725 >path3 &&
726 git add path3 &&
727 test_tick &&
728 git commit -a -m child2 &&
729 git branch bar &&
730 test_must_fail git push ../child1 foo bar 2>stderr &&
731 grep "refusing inconsistent update" stderr
735 test_expect_success 'push --porcelain' '
736 mk_empty &&
737 echo >.git/foo "To testrepo" &&
738 echo >>.git/foo "* refs/heads/master:refs/remotes/origin/master [new branch]" &&
739 echo >>.git/foo "Done" &&
740 git push >.git/bar --porcelain testrepo refs/heads/master:refs/remotes/origin/master &&
742 cd testrepo &&
743 r=$(git show-ref -s --verify refs/remotes/origin/master) &&
744 test "z$r" = "z$the_commit" &&
745 test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
746 ) &&
747 test_cmp .git/foo .git/bar
750 test_expect_success 'push --porcelain bad url' '
751 mk_empty &&
752 test_must_fail git push >.git/bar --porcelain asdfasdfasd refs/heads/master:refs/remotes/origin/master &&
753 test_must_fail grep -q Done .git/bar
756 test_expect_success 'push --porcelain rejected' '
757 mk_empty &&
758 git push testrepo refs/heads/master:refs/remotes/origin/master &&
759 (cd testrepo &&
760 git reset --hard origin/master^
761 git config receive.denyCurrentBranch true) &&
763 echo >.git/foo "To testrepo" &&
764 echo >>.git/foo "! refs/heads/master:refs/heads/master [remote rejected] (branch is currently checked out)" &&
766 test_must_fail git push >.git/bar --porcelain testrepo refs/heads/master:refs/heads/master &&
767 test_cmp .git/foo .git/bar
770 test_expect_success 'push --porcelain --dry-run rejected' '
771 mk_empty &&
772 git push testrepo refs/heads/master:refs/remotes/origin/master &&
773 (cd testrepo &&
774 git reset --hard origin/master
775 git config receive.denyCurrentBranch true) &&
777 echo >.git/foo "To testrepo" &&
778 echo >>.git/foo "! refs/heads/master^:refs/heads/master [rejected] (non-fast-forward)" &&
779 echo >>.git/foo "Done" &&
781 test_must_fail git push >.git/bar --porcelain --dry-run testrepo refs/heads/master^:refs/heads/master &&
782 test_cmp .git/foo .git/bar
785 test_done