3 test_description
='fetching and pushing, with or without wildcard'
15 mv .git
/hooks .git
/hooks-disabled
24 git push testrepo
$the_first_commit:refs
/$ref ||
{
25 echo "Oops, push refs/$ref failure"
32 r
=$
(git show-ref
-s --verify refs
/$ref) &&
33 test "z$r" = "z$the_first_commit" ||
{
34 echo "Oops, refs/$ref is wrong"
42 check_push_result
() {
49 r
=$
(git show-ref
-s --verify refs
/$ref) &&
50 test "z$r" = "z$it" ||
{
51 echo "Oops, refs/$ref is wrong"
59 test_expect_success setup
'
64 git commit -a -m repo &&
65 the_first_commit=$(git show-ref -s --verify refs/heads/master) &&
70 git commit -a -m second &&
71 the_commit=$(git show-ref -s --verify refs/heads/master)
75 test_expect_success
'fetch without wildcard' '
79 git fetch .. refs/heads/master:refs/remotes/origin/master &&
81 r=$(git show-ref -s --verify refs/remotes/origin/master) &&
82 test "z$r" = "z$the_commit" &&
84 test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
88 test_expect_success
'fetch with wildcard' '
92 git config remote.up.url .. &&
93 git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
96 r=$(git show-ref -s --verify refs/remotes/origin/master) &&
97 test "z$r" = "z$the_commit" &&
99 test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
103 test_expect_success
'fetch with insteadOf' '
108 git config "url.$TRASH.insteadOf" trash/ &&
109 git config remote.up.url trash/. &&
110 git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
113 r=$(git show-ref -s --verify refs/remotes/origin/master) &&
114 test "z$r" = "z$the_commit" &&
116 test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
120 test_expect_success
'push without wildcard' '
123 git push testrepo refs/heads/master:refs/remotes/origin/master &&
126 r=$(git show-ref -s --verify refs/remotes/origin/master) &&
127 test "z$r" = "z$the_commit" &&
129 test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
133 test_expect_success
'push with wildcard' '
136 git push testrepo "refs/heads/*:refs/remotes/origin/*" &&
139 r=$(git show-ref -s --verify refs/remotes/origin/master) &&
140 test "z$r" = "z$the_commit" &&
142 test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
146 test_expect_success
'push with insteadOf' '
149 git config "url.$TRASH.insteadOf" trash/ &&
150 git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
153 r=$(git show-ref -s --verify refs/remotes/origin/master) &&
154 test "z$r" = "z$the_commit" &&
156 test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
160 test_expect_success
'push with matching heads' '
162 mk_test heads/master &&
164 check_push_result $the_commit heads/master
168 test_expect_success
'push with matching heads on the command line' '
170 mk_test heads/master &&
171 git push testrepo : &&
172 check_push_result $the_commit heads/master
176 test_expect_success
'failed (non-fast-forward) push with matching heads' '
178 mk_test heads/master &&
179 git push testrepo : &&
180 git commit --amend -massaged &&
181 test_must_fail git push testrepo &&
182 check_push_result $the_commit heads/master &&
183 git reset --hard $the_commit
187 test_expect_success
'push --force with matching heads' '
189 mk_test heads/master &&
190 git push testrepo : &&
191 git commit --amend -massaged &&
192 git push --force testrepo &&
193 ! check_push_result $the_commit heads/master &&
194 git reset --hard $the_commit
198 test_expect_success
'push with matching heads and forced update' '
200 mk_test heads/master &&
201 git push testrepo : &&
202 git commit --amend -massaged &&
203 git push testrepo +: &&
204 ! check_push_result $the_commit heads/master &&
205 git reset --hard $the_commit
209 test_expect_success
'push with no ambiguity (1)' '
211 mk_test heads/master &&
212 git push testrepo master:master &&
213 check_push_result $the_commit heads/master
217 test_expect_success
'push with no ambiguity (2)' '
219 mk_test remotes/origin/master &&
220 git push testrepo master:origin/master &&
221 check_push_result $the_commit remotes/origin/master
225 test_expect_success
'push with colon-less refspec, no ambiguity' '
227 mk_test heads/master heads/t/master &&
228 git branch -f t/master master &&
229 git push testrepo master &&
230 check_push_result $the_commit heads/master &&
231 check_push_result $the_first_commit heads/t/master
235 test_expect_success
'push with weak ambiguity (1)' '
237 mk_test heads/master remotes/origin/master &&
238 git push testrepo master:master &&
239 check_push_result $the_commit heads/master &&
240 check_push_result $the_first_commit remotes/origin/master
244 test_expect_success
'push with weak ambiguity (2)' '
246 mk_test heads/master remotes/origin/master remotes/another/master &&
247 git push testrepo master:master &&
248 check_push_result $the_commit heads/master &&
249 check_push_result $the_first_commit remotes/origin/master remotes/another/master
253 test_expect_success
'push with ambiguity' '
255 mk_test heads/frotz tags/frotz &&
256 if git push testrepo master:frotz
258 echo "Oops, should have failed"
261 check_push_result $the_first_commit heads/frotz tags/frotz
266 test_expect_success
'push with colon-less refspec (1)' '
268 mk_test heads/frotz tags/frotz &&
269 git branch -f frotz master &&
270 git push testrepo frotz &&
271 check_push_result $the_commit heads/frotz &&
272 check_push_result $the_first_commit tags/frotz
276 test_expect_success
'push with colon-less refspec (2)' '
278 mk_test heads/frotz tags/frotz &&
279 if git show-ref --verify -q refs/heads/frotz
284 git push testrepo frotz &&
285 check_push_result $the_commit tags/frotz &&
286 check_push_result $the_first_commit heads/frotz
290 test_expect_success
'push with colon-less refspec (3)' '
293 if git show-ref --verify -q refs/tags/frotz
297 git branch -f frotz master &&
298 git push testrepo frotz &&
299 check_push_result $the_commit heads/frotz &&
300 test 1 = $( cd testrepo && git show-ref | wc -l )
303 test_expect_success
'push with colon-less refspec (4)' '
306 if git show-ref --verify -q refs/heads/frotz
311 git push testrepo frotz &&
312 check_push_result $the_commit tags/frotz &&
313 test 1 = $( cd testrepo && git show-ref | wc -l )
317 test_expect_success
'push head with non-existant, incomplete dest' '
320 git push testrepo master:branch &&
321 check_push_result $the_commit heads/branch
325 test_expect_success
'push tag with non-existant, incomplete dest' '
329 git push testrepo v1.0:tag &&
330 check_push_result $the_commit tags/tag
334 test_expect_success
'push sha1 with non-existant, incomplete dest' '
337 test_must_fail git push testrepo `git rev-parse master`:foo
341 test_expect_success
'push ref expression with non-existant, incomplete dest' '
344 test_must_fail git push testrepo master^:branch
348 test_expect_success
'push with HEAD' '
350 mk_test heads/master &&
351 git checkout master &&
352 git push testrepo HEAD &&
353 check_push_result $the_commit heads/master
357 test_expect_success
'push with HEAD nonexisting at remote' '
359 mk_test heads/master &&
360 git checkout -b local master &&
361 git push testrepo HEAD &&
362 check_push_result $the_commit heads/local
365 test_expect_success
'push with +HEAD' '
367 mk_test heads/master &&
368 git checkout master &&
369 git branch -D local &&
370 git checkout -b local &&
371 git push testrepo master local &&
372 check_push_result $the_commit heads/master &&
373 check_push_result $the_commit heads/local &&
375 # Without force rewinding should fail
376 git reset --hard HEAD^ &&
377 test_must_fail git push testrepo HEAD &&
378 check_push_result $the_commit heads/local &&
380 # With force rewinding should succeed
381 git push testrepo +HEAD &&
382 check_push_result $the_first_commit heads/local
386 test_expect_success
'push HEAD with non-existant, incomplete dest' '
389 git checkout master &&
390 git push testrepo HEAD:branch &&
391 check_push_result $the_commit heads/branch
395 test_expect_success
'push with config remote.*.push = HEAD' '
397 mk_test heads/local &&
398 git checkout master &&
399 git branch -f local $the_commit &&
402 git checkout local &&
403 git reset --hard $the_first_commit
405 git config remote.there.url testrepo &&
406 git config remote.there.push HEAD &&
407 git config branch.master.remote there &&
409 check_push_result $the_commit heads/master &&
410 check_push_result $the_first_commit heads/local
413 # clean up the cruft left with the previous one
414 git config
--remove-section remote.there
415 git config
--remove-section branch.master
417 test_expect_success
'push with dry-run' '
419 mk_test heads/master &&
421 old_commit=$(git show-ref -s --verify refs/heads/master)) &&
422 git push --dry-run testrepo &&
423 check_push_result $old_commit heads/master
426 test_expect_success
'push updates local refs' '
428 rm -rf parent child &&
430 (cd parent && git init &&
431 echo one >foo && git add foo && git commit -m one) &&
432 git clone parent child &&
434 echo two >foo && git commit -a -m two &&
436 test $(git rev-parse master) = $(git rev-parse remotes/origin/master))
440 test_expect_success
'push updates up-to-date local refs' '
442 rm -rf parent child &&
444 (cd parent && git init &&
445 echo one >foo && git add foo && git commit -m one) &&
446 git clone parent child1 &&
447 git clone parent child2 &&
449 echo two >foo && git commit -a -m two &&
452 git pull ../child1 master &&
454 test $(git rev-parse master) = $(git rev-parse remotes/origin/master))
458 test_expect_success
'push preserves up-to-date packed refs' '
460 rm -rf parent child &&
462 (cd parent && git init &&
463 echo one >foo && git add foo && git commit -m one) &&
464 git clone parent child &&
467 ! test -f .git/refs/remotes/origin/master)
471 test_expect_success
'push does not update local refs on failure' '
473 rm -rf parent child &&
475 (cd parent && git init &&
476 echo one >foo && git add foo && git commit -m one &&
477 echo exit 1 >.git/hooks/pre-receive &&
478 chmod +x .git/hooks/pre-receive) &&
479 git clone parent child &&
481 echo two >foo && git commit -a -m two &&
482 test_must_fail git push &&
483 test $(git rev-parse master) != \
484 $(git rev-parse remotes/origin/master))
488 test_expect_success
'allow deleting an invalid remote ref' '
491 rm -f testrepo/.git/objects/??/* &&
492 git push testrepo :refs/heads/master &&
493 (cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
497 test_expect_success
'fetch with branches' '
499 git branch second $the_first_commit &&
500 git checkout second &&
501 echo ".." > testrepo/.git/branches/branch1 &&
504 r=$(git show-ref -s --verify refs/heads/branch1) &&
505 test "z$r" = "z$the_commit" &&
506 test 1 = $(git for-each-ref refs/heads | wc -l)
511 test_expect_success
'fetch with branches containing #' '
513 echo "..#second" > testrepo/.git/branches/branch2 &&
516 r=$(git show-ref -s --verify refs/heads/branch2) &&
517 test "z$r" = "z$the_first_commit" &&
518 test 1 = $(git for-each-ref refs/heads | wc -l)
523 test_expect_success
'push with branches' '
525 git checkout second &&
526 echo "testrepo" > .git/branches/branch1 &&
529 r=$(git show-ref -s --verify refs/heads/master) &&
530 test "z$r" = "z$the_first_commit" &&
531 test 1 = $(git for-each-ref refs/heads | wc -l)
535 test_expect_success
'push with branches containing #' '
537 echo "testrepo#branch3" > .git/branches/branch2 &&
540 r=$(git show-ref -s --verify refs/heads/branch3) &&
541 test "z$r" = "z$the_first_commit" &&
542 test 1 = $(git for-each-ref refs/heads | wc -l)