3 test_description
='fetching and pushing, with or without wildcard'
15 git config receive.denyCurrentBranch warn
&&
16 mv .git
/hooks .git
/hooks-disabled
25 git push testrepo
$the_first_commit:refs
/$ref ||
{
26 echo "Oops, push refs/$ref failure"
33 r
=$
(git show-ref
-s --verify refs
/$ref) &&
34 test "z$r" = "z$the_first_commit" ||
{
35 echo "Oops, refs/$ref is wrong"
45 git clone testrepo
"$1"
48 check_push_result
() {
55 r
=$
(git show-ref
-s --verify refs
/$ref) &&
56 test "z$r" = "z$it" ||
{
57 echo "Oops, refs/$ref is wrong"
65 test_expect_success setup
'
70 git commit -a -m repo &&
71 the_first_commit=$(git show-ref -s --verify refs/heads/master) &&
76 git commit -a -m second &&
77 the_commit=$(git show-ref -s --verify refs/heads/master)
81 test_expect_success
'fetch without wildcard' '
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' '
98 git config remote.up.url .. &&
99 git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
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' '
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/*" &&
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)' '
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/*" &&
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' '
146 git push testrepo refs/heads/master:refs/remotes/origin/master &&
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' '
159 git push testrepo "refs/heads/*:refs/remotes/origin/*" &&
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' '
172 git config "url.$TRASH.insteadOf" trash/ &&
173 git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
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' '
186 git config "url.$TRASH.pushInsteadOf" trash/ &&
187 git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
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)' '
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 &&
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 &&
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
311 echo "Oops, should have failed"
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
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)' '
346 if git show-ref --verify -q refs/tags/frotz
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)' '
359 if git show-ref --verify -q refs/heads/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' '
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' '
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' '
390 test_must_fail git push testrepo `git rev-parse master`:foo
394 test_expect_success
'push ref expression with non-existant, incomplete dest' '
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' '
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 &&
455 git checkout local &&
456 git reset --hard $the_first_commit
458 git config remote.there.url testrepo &&
459 git config remote.there.push HEAD &&
460 git config branch.master.remote there &&
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 &&
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 &&
488 old_commit=$(git show-ref -s --verify refs/heads/master)
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 &&
500 git pull .. master &&
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 &&
513 (cd child1 && git pull .. master && git push) &&
516 git pull ../child1 master &&
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 &&
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 &&
540 mkdir testrepo/.git/hooks &&
541 echo "#!/no/frobnication/today" >testrepo/.git/hooks/pre-receive &&
542 chmod +x testrepo/.git/hooks/pre-receive &&
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' '
592 git checkout master &&
593 git config receive.denyCurrentBranch warn
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' '
603 git checkout master &&
604 git config receive.denyCurrentBranch true
606 test_must_fail git push testrepo master
609 test_expect_success
'allow push to HEAD of bare repository (bare)' '
613 git checkout master &&
614 git config receive.denyCurrentBranch true &&
615 git config core.bare true
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)' '
625 git checkout master &&
626 git config receive.denyCurrentBranch false
628 git push testrepo master 2>stderr &&
629 ! grep "warning: updating the current branch" stderr
632 test_expect_success
'fetch with branches' '
634 git branch second $the_first_commit &&
635 git checkout second &&
636 echo ".." > testrepo/.git/branches/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)
647 test_expect_success
'fetch with branches containing #' '
649 echo "..#second" > testrepo/.git/branches/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)
660 test_expect_success
'push with branches' '
662 git checkout second &&
663 echo "testrepo" > .git/branches/branch1 &&
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 #' '
675 echo "testrepo#branch3" > .git/branches/branch2 &&
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)
686 test_expect_success
'push into aliased refs (consistent)' '
687 mk_test heads/master &&
693 git symbolic-ref refs/heads/bar refs/heads/foo
694 git config receive.denyCurrentBranch false
701 git commit -a -m child2 &&
704 git push ../child1 foo bar
708 test_expect_success
'push into aliased refs (inconsistent)' '
709 mk_test heads/master &&
715 git symbolic-ref refs/heads/bar refs/heads/foo
716 git config receive.denyCurrentBranch false
723 git commit -a -m child2 &&
728 git commit -a -m child2 &&
730 test_must_fail git push ../child1 foo bar 2>stderr &&
731 grep "refusing inconsistent update" stderr
735 test_expect_success
'push --porcelain' '
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 &&
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)
747 test_cmp .git/foo .git/bar
750 test_expect_success
'push --porcelain bad url' '
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' '
758 git push testrepo refs/heads/master:refs/remotes/origin/master &&
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' '
772 git push testrepo refs/heads/master:refs/remotes/origin/master &&
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_expect_success
'receive.denyCurrentBranch = updateInstead' '
786 git push testrepo master &&
789 git config receive.denyCurrentBranch updateInstead
791 test_commit third path2 &&
792 git push testrepo master &&
793 test $(git rev-parse HEAD) = $(cd testrepo && git rev-parse HEAD) &&
794 test third = "$(cat testrepo/path2)" &&
796 git update-index --refresh &&
797 git diff-files --quiet &&
798 git diff-index --cached HEAD --
802 test_expect_success
'receive.denyCurrentBranch = detachInstead' '
805 git config receive.denyCurrentBranch detachInstead
807 OLDHEAD=$(cd testrepo && git rev-parse HEAD) &&
808 test_commit fourth path2 &&
809 test fourth = "$(cat path2)" &&
810 git push testrepo master &&
811 test $OLDHEAD = $(cd testrepo && git rev-parse HEAD) &&
812 test fourth != "$(cat testrepo/path2)" &&
814 test_must_fail git symbolic-ref HEAD &&
815 git update-index --refresh &&
816 git diff-files --quiet &&
817 git diff-index --cached HEAD --