1#!/bin/sh
2
3test_description='Basic fetch/push functionality.
4
5This test checks the following functionality:
6
7* command-line syntax
8* refspecs
9* fast-forward detection, and overriding it
10* configuration
11* hooks
12* --porcelain output format
13* hiderefs
14* reflogs
15'
16
17. ./test-lib.sh
18
19D=$(pwd)
20
21mk_empty () {
22 repo_name="$1"
23 rm -fr "$repo_name" &&
24 mkdir "$repo_name" &&
25 (
26 cd "$repo_name" &&
27 git init &&
28 git config receive.denyCurrentBranch warn &&
29 mv .git/hooks .git/hooks-disabled
30 )
31}
32
33mk_test () {
34 repo_name="$1"
35 shift
36
37 mk_empty "$repo_name" &&
38 (
39 for ref in "$@"
40 do
41 git push "$repo_name" $the_first_commit:refs/$ref ||
42 exit
43 done &&
44 cd "$repo_name" &&
45 for ref in "$@"
46 do
47 echo "$the_first_commit" >expect &&
48 git show-ref -s --verify refs/$ref >actual &&
49 test_cmp expect actual ||
50 exit
51 done &&
52 git fsck --full
53 )
54}
55
56mk_test_with_hooks() {
57 repo_name=$1
58 mk_test "$@" &&
59 (
60 cd "$repo_name" &&
61 mkdir .git/hooks &&
62 cd .git/hooks &&
63
64 cat >pre-receive <<-'EOF' &&
65 #!/bin/sh
66 cat - >>pre-receive.actual
67 EOF
68
69 cat >update <<-'EOF' &&
70 #!/bin/sh
71 printf "%s %s %s\n" "$@" >>update.actual
72 EOF
73
74 cat >post-receive <<-'EOF' &&
75 #!/bin/sh
76 cat - >>post-receive.actual
77 EOF
78
79 cat >post-update <<-'EOF' &&
80 #!/bin/sh
81 for ref in "$@"
82 do
83 printf "%s\n" "$ref" >>post-update.actual
84 done
85 EOF
86
87 chmod +x pre-receive update post-receive post-update
88 )
89}
90
91mk_child() {
92 rm -rf "$2" &&
93 git clone "$1" "$2"
94}
95
96check_push_result () {
97 test $# -ge 3 ||
98 error "bug in the test script: check_push_result requires at least 3 parameters"
99
100 repo_name="$1"
101 shift
102
103 (
104 cd "$repo_name" &&
105 echo "$1" >expect &&
106 shift &&
107 for ref in "$@"
108 do
109 git show-ref -s --verify refs/$ref >actual &&
110 test_cmp expect actual ||
111 exit
112 done &&
113 git fsck --full
114 )
115}
116
117test_expect_success setup '
118
119 >path1 &&
120 git add path1 &&
121 test_tick &&
122 git commit -a -m repo &&
123 the_first_commit=$(git show-ref -s --verify refs/heads/master) &&
124
125 >path2 &&
126 git add path2 &&
127 test_tick &&
128 git commit -a -m second &&
129 the_commit=$(git show-ref -s --verify refs/heads/master)
130
131'
132
133test_expect_success 'fetch without wildcard' '
134 mk_empty testrepo &&
135 (
136 cd testrepo &&
137 git fetch .. refs/heads/master:refs/remotes/origin/master &&
138
139 echo "$the_commit commit refs/remotes/origin/master" >expect &&
140 git for-each-ref refs/remotes/origin >actual &&
141 test_cmp expect actual
142 )
143'
144
145test_expect_success 'fetch with wildcard' '
146 mk_empty testrepo &&
147 (
148 cd testrepo &&
149 git config remote.up.url .. &&
150 git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
151 git fetch up &&
152
153 echo "$the_commit commit refs/remotes/origin/master" >expect &&
154 git for-each-ref refs/remotes/origin >actual &&
155 test_cmp expect actual
156 )
157'
158
159test_expect_success 'fetch with insteadOf' '
160 mk_empty testrepo &&
161 (
162 TRASH=$(pwd)/ &&
163 cd testrepo &&
164 git config "url.$TRASH.insteadOf" trash/ &&
165 git config remote.up.url trash/. &&
166 git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
167 git fetch up &&
168
169 echo "$the_commit commit refs/remotes/origin/master" >expect &&
170 git for-each-ref refs/remotes/origin >actual &&
171 test_cmp expect actual
172 )
173'
174
175test_expect_success 'fetch with pushInsteadOf (should not rewrite)' '
176 mk_empty testrepo &&
177 (
178 TRASH=$(pwd)/ &&
179 cd testrepo &&
180 git config "url.trash/.pushInsteadOf" "$TRASH" &&
181 git config remote.up.url "$TRASH." &&
182 git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
183 git fetch up &&
184
185 echo "$the_commit commit refs/remotes/origin/master" >expect &&
186 git for-each-ref refs/remotes/origin >actual &&
187 test_cmp expect actual
188 )
189'
190
191test_expect_success 'push without wildcard' '
192 mk_empty testrepo &&
193
194 git push testrepo refs/heads/master:refs/remotes/origin/master &&
195 (
196 cd testrepo &&
197 echo "$the_commit commit refs/remotes/origin/master" >expect &&
198 git for-each-ref refs/remotes/origin >actual &&
199 test_cmp expect actual
200 )
201'
202
203test_expect_success 'push with wildcard' '
204 mk_empty testrepo &&
205
206 git push testrepo "refs/heads/*:refs/remotes/origin/*" &&
207 (
208 cd testrepo &&
209 echo "$the_commit commit refs/remotes/origin/master" >expect &&
210 git for-each-ref refs/remotes/origin >actual &&
211 test_cmp expect actual
212 )
213'
214
215test_expect_success 'push with insteadOf' '
216 mk_empty testrepo &&
217 TRASH="$(pwd)/" &&
218 test_config "url.$TRASH.insteadOf" trash/ &&
219 git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
220 (
221 cd testrepo &&
222 echo "$the_commit commit refs/remotes/origin/master" >expect &&
223 git for-each-ref refs/remotes/origin >actual &&
224 test_cmp expect actual
225 )
226'
227
228test_expect_success 'push with pushInsteadOf' '
229 mk_empty testrepo &&
230 TRASH="$(pwd)/" &&
231 test_config "url.$TRASH.pushInsteadOf" trash/ &&
232 git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
233 (
234 cd testrepo &&
235 echo "$the_commit commit refs/remotes/origin/master" >expect &&
236 git for-each-ref refs/remotes/origin >actual &&
237 test_cmp expect actual
238 )
239'
240
241test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' '
242 mk_empty testrepo &&
243 test_config "url.trash2/.pushInsteadOf" testrepo/ &&
244 test_config "url.trash3/.pushInsteadOf" trash/wrong &&
245 test_config remote.r.url trash/wrong &&
246 test_config remote.r.pushurl "testrepo/" &&
247 git push r refs/heads/master:refs/remotes/origin/master &&
248 (
249 cd testrepo &&
250 echo "$the_commit commit refs/remotes/origin/master" >expect &&
251 git for-each-ref refs/remotes/origin >actual &&
252 test_cmp expect actual
253 )
254'
255
256test_expect_success 'push with matching heads' '
257
258 mk_test testrepo heads/master &&
259 git push testrepo : &&
260 check_push_result testrepo $the_commit heads/master
261
262'
263
264test_expect_success 'push with matching heads on the command line' '
265
266 mk_test testrepo heads/master &&
267 git push testrepo : &&
268 check_push_result testrepo $the_commit heads/master
269
270'
271
272test_expect_success 'failed (non-fast-forward) push with matching heads' '
273
274 mk_test testrepo heads/master &&
275 git push testrepo : &&
276 git commit --amend -massaged &&
277 test_must_fail git push testrepo &&
278 check_push_result testrepo $the_commit heads/master &&
279 git reset --hard $the_commit
280
281'
282
283test_expect_success 'push --force with matching heads' '
284
285 mk_test testrepo heads/master &&
286 git push testrepo : &&
287 git commit --amend -massaged &&
288 git push --force testrepo : &&
289 ! check_push_result testrepo $the_commit heads/master &&
290 git reset --hard $the_commit
291
292'
293
294test_expect_success 'push with matching heads and forced update' '
295
296 mk_test testrepo heads/master &&
297 git push testrepo : &&
298 git commit --amend -massaged &&
299 git push testrepo +: &&
300 ! check_push_result testrepo $the_commit heads/master &&
301 git reset --hard $the_commit
302
303'
304
305test_expect_success 'push with no ambiguity (1)' '
306
307 mk_test testrepo heads/master &&
308 git push testrepo master:master &&
309 check_push_result testrepo $the_commit heads/master
310
311'
312
313test_expect_success 'push with no ambiguity (2)' '
314
315 mk_test testrepo remotes/origin/master &&
316 git push testrepo master:origin/master &&
317 check_push_result testrepo $the_commit remotes/origin/master
318
319'
320
321test_expect_success 'push with colon-less refspec, no ambiguity' '
322
323 mk_test testrepo heads/master heads/t/master &&
324 git branch -f t/master master &&
325 git push testrepo master &&
326 check_push_result testrepo $the_commit heads/master &&
327 check_push_result testrepo $the_first_commit heads/t/master
328
329'
330
331test_expect_success 'push with weak ambiguity (1)' '
332
333 mk_test testrepo heads/master remotes/origin/master &&
334 git push testrepo master:master &&
335 check_push_result testrepo $the_commit heads/master &&
336 check_push_result testrepo $the_first_commit remotes/origin/master
337
338'
339
340test_expect_success 'push with weak ambiguity (2)' '
341
342 mk_test testrepo heads/master remotes/origin/master remotes/another/master &&
343 git push testrepo master:master &&
344 check_push_result testrepo $the_commit heads/master &&
345 check_push_result testrepo $the_first_commit remotes/origin/master remotes/another/master
346
347'
348
349test_expect_success 'push with ambiguity' '
350
351 mk_test testrepo heads/frotz tags/frotz &&
352 test_must_fail git push testrepo master:frotz &&
353 check_push_result testrepo $the_first_commit heads/frotz tags/frotz
354
355'
356
357test_expect_success 'push with colon-less refspec (1)' '
358
359 mk_test testrepo heads/frotz tags/frotz &&
360 git branch -f frotz master &&
361 git push testrepo frotz &&
362 check_push_result testrepo $the_commit heads/frotz &&
363 check_push_result testrepo $the_first_commit tags/frotz
364
365'
366
367test_expect_success 'push with colon-less refspec (2)' '
368
369 mk_test testrepo heads/frotz tags/frotz &&
370 if git show-ref --verify -q refs/heads/frotz
371 then
372 git branch -D frotz
373 fi &&
374 git tag -f frotz &&
375 git push -f testrepo frotz &&
376 check_push_result testrepo $the_commit tags/frotz &&
377 check_push_result testrepo $the_first_commit heads/frotz
378
379'
380
381test_expect_success 'push with colon-less refspec (3)' '
382
383 mk_test testrepo &&
384 if git show-ref --verify -q refs/tags/frotz
385 then
386 git tag -d frotz
387 fi &&
388 git branch -f frotz master &&
389 git push testrepo frotz &&
390 check_push_result testrepo $the_commit heads/frotz &&
391 test 1 = $( cd testrepo && git show-ref | wc -l )
392'
393
394test_expect_success 'push with colon-less refspec (4)' '
395
396 mk_test testrepo &&
397 if git show-ref --verify -q refs/heads/frotz
398 then
399 git branch -D frotz
400 fi &&
401 git tag -f frotz &&
402 git push testrepo frotz &&
403 check_push_result testrepo $the_commit tags/frotz &&
404 test 1 = $( cd testrepo && git show-ref | wc -l )
405
406'
407
408test_expect_success 'push head with non-existent, incomplete dest' '
409
410 mk_test testrepo &&
411 git push testrepo master:branch &&
412 check_push_result testrepo $the_commit heads/branch
413
414'
415
416test_expect_success 'push tag with non-existent, incomplete dest' '
417
418 mk_test testrepo &&
419 git tag -f v1.0 &&
420 git push testrepo v1.0:tag &&
421 check_push_result testrepo $the_commit tags/tag
422
423'
424
425test_expect_success 'push sha1 with non-existent, incomplete dest' '
426
427 mk_test testrepo &&
428 test_must_fail git push testrepo $(git rev-parse master):foo
429
430'
431
432test_expect_success 'push ref expression with non-existent, incomplete dest' '
433
434 mk_test testrepo &&
435 test_must_fail git push testrepo master^:branch
436
437'
438
439test_expect_success 'push with HEAD' '
440
441 mk_test testrepo heads/master &&
442 git checkout master &&
443 git push testrepo HEAD &&
444 check_push_result testrepo $the_commit heads/master
445
446'
447
448test_expect_success 'push with HEAD nonexisting at remote' '
449
450 mk_test testrepo heads/master &&
451 git checkout -b local master &&
452 git push testrepo HEAD &&
453 check_push_result testrepo $the_commit heads/local
454'
455
456test_expect_success 'push with +HEAD' '
457
458 mk_test testrepo heads/master &&
459 git checkout master &&
460 git branch -D local &&
461 git checkout -b local &&
462 git push testrepo master local &&
463 check_push_result testrepo $the_commit heads/master &&
464 check_push_result testrepo $the_commit heads/local &&
465
466 # Without force rewinding should fail
467 git reset --hard HEAD^ &&
468 test_must_fail git push testrepo HEAD &&
469 check_push_result testrepo $the_commit heads/local &&
470
471 # With force rewinding should succeed
472 git push testrepo +HEAD &&
473 check_push_result testrepo $the_first_commit heads/local
474
475'
476
477test_expect_success 'push HEAD with non-existent, incomplete dest' '
478
479 mk_test testrepo &&
480 git checkout master &&
481 git push testrepo HEAD:branch &&
482 check_push_result testrepo $the_commit heads/branch
483
484'
485
486test_expect_success 'push with config remote.*.push = HEAD' '
487
488 mk_test testrepo heads/local &&
489 git checkout master &&
490 git branch -f local $the_commit &&
491 (
492 cd testrepo &&
493 git checkout local &&
494 git reset --hard $the_first_commit
495 ) &&
496 test_config remote.there.url testrepo &&
497 test_config remote.there.push HEAD &&
498 test_config branch.master.remote there &&
499 git push &&
500 check_push_result testrepo $the_commit heads/master &&
501 check_push_result testrepo $the_first_commit heads/local
502'
503
504test_expect_success 'push with remote.pushdefault' '
505 mk_test up_repo heads/master &&
506 mk_test down_repo heads/master &&
507 test_config remote.up.url up_repo &&
508 test_config remote.down.url down_repo &&
509 test_config branch.master.remote up &&
510 test_config remote.pushdefault down &&
511 test_config push.default matching &&
512 git push &&
513 check_push_result up_repo $the_first_commit heads/master &&
514 check_push_result down_repo $the_commit heads/master
515'
516
517test_expect_success 'push with config remote.*.pushurl' '
518
519 mk_test testrepo heads/master &&
520 git checkout master &&
521 test_config remote.there.url test2repo &&
522 test_config remote.there.pushurl testrepo &&
523 git push there : &&
524 check_push_result testrepo $the_commit heads/master
525'
526
527test_expect_success 'push with config branch.*.pushremote' '
528 mk_test up_repo heads/master &&
529 mk_test side_repo heads/master &&
530 mk_test down_repo heads/master &&
531 test_config remote.up.url up_repo &&
532 test_config remote.pushdefault side_repo &&
533 test_config remote.down.url down_repo &&
534 test_config branch.master.remote up &&
535 test_config branch.master.pushremote down &&
536 test_config push.default matching &&
537 git push &&
538 check_push_result up_repo $the_first_commit heads/master &&
539 check_push_result side_repo $the_first_commit heads/master &&
540 check_push_result down_repo $the_commit heads/master
541'
542
543test_expect_success 'branch.*.pushremote config order is irrelevant' '
544 mk_test one_repo heads/master &&
545 mk_test two_repo heads/master &&
546 test_config remote.one.url one_repo &&
547 test_config remote.two.url two_repo &&
548 test_config branch.master.pushremote two_repo &&
549 test_config remote.pushdefault one_repo &&
550 test_config push.default matching &&
551 git push &&
552 check_push_result one_repo $the_first_commit heads/master &&
553 check_push_result two_repo $the_commit heads/master
554'
555
556test_expect_success 'push with dry-run' '
557
558 mk_test testrepo heads/master &&
559 old_commit=$(git -C testrepo show-ref -s --verify refs/heads/master) &&
560 git push --dry-run testrepo : &&
561 check_push_result testrepo $old_commit heads/master
562'
563
564test_expect_success 'push updates local refs' '
565
566 mk_test testrepo heads/master &&
567 mk_child testrepo child &&
568 (
569 cd child &&
570 git pull .. master &&
571 git push &&
572 test $(git rev-parse master) = \
573 $(git rev-parse remotes/origin/master)
574 )
575
576'
577
578test_expect_success 'push updates up-to-date local refs' '
579
580 mk_test testrepo heads/master &&
581 mk_child testrepo child1 &&
582 mk_child testrepo child2 &&
583 (cd child1 && git pull .. master && git push) &&
584 (
585 cd child2 &&
586 git pull ../child1 master &&
587 git push &&
588 test $(git rev-parse master) = \
589 $(git rev-parse remotes/origin/master)
590 )
591
592'
593
594test_expect_success 'push preserves up-to-date packed refs' '
595
596 mk_test testrepo heads/master &&
597 mk_child testrepo child &&
598 (
599 cd child &&
600 git push &&
601 ! test -f .git/refs/remotes/origin/master
602 )
603
604'
605
606test_expect_success 'push does not update local refs on failure' '
607
608 mk_test testrepo heads/master &&
609 mk_child testrepo child &&
610 mkdir testrepo/.git/hooks &&
611 echo "#!/no/frobnication/today" >testrepo/.git/hooks/pre-receive &&
612 chmod +x testrepo/.git/hooks/pre-receive &&
613 (
614 cd child &&
615 git pull .. master &&
616 test_must_fail git push &&
617 test $(git rev-parse master) != \
618 $(git rev-parse remotes/origin/master)
619 )
620
621'
622
623test_expect_success 'allow deleting an invalid remote ref' '
624
625 mk_test testrepo heads/master &&
626 rm -f testrepo/.git/objects/??/* &&
627 git push testrepo :refs/heads/master &&
628 (cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
629
630'
631
632test_expect_success 'pushing valid refs triggers post-receive and post-update hooks' '
633 mk_test_with_hooks testrepo heads/master heads/next &&
634 orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
635 newmaster=$(git show-ref -s --verify refs/heads/master) &&
636 orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
637 newnext=$ZERO_OID &&
638 git push testrepo refs/heads/master:refs/heads/master :refs/heads/next &&
639 (
640 cd testrepo/.git &&
641 cat >pre-receive.expect <<-EOF &&
642 $orgmaster $newmaster refs/heads/master
643 $orgnext $newnext refs/heads/next
644 EOF
645
646 cat >update.expect <<-EOF &&
647 refs/heads/master $orgmaster $newmaster
648 refs/heads/next $orgnext $newnext
649 EOF
650
651 cat >post-receive.expect <<-EOF &&
652 $orgmaster $newmaster refs/heads/master
653 $orgnext $newnext refs/heads/next
654 EOF
655
656 cat >post-update.expect <<-EOF &&
657 refs/heads/master
658 refs/heads/next
659 EOF
660
661 test_cmp pre-receive.expect pre-receive.actual &&
662 test_cmp update.expect update.actual &&
663 test_cmp post-receive.expect post-receive.actual &&
664 test_cmp post-update.expect post-update.actual
665 )
666'
667
668test_expect_success 'deleting dangling ref triggers hooks with correct args' '
669 mk_test_with_hooks testrepo heads/master &&
670 rm -f testrepo/.git/objects/??/* &&
671 git push testrepo :refs/heads/master &&
672 (
673 cd testrepo/.git &&
674 cat >pre-receive.expect <<-EOF &&
675 $ZERO_OID $ZERO_OID refs/heads/master
676 EOF
677
678 cat >update.expect <<-EOF &&
679 refs/heads/master $ZERO_OID $ZERO_OID
680 EOF
681
682 cat >post-receive.expect <<-EOF &&
683 $ZERO_OID $ZERO_OID refs/heads/master
684 EOF
685
686 cat >post-update.expect <<-EOF &&
687 refs/heads/master
688 EOF
689
690 test_cmp pre-receive.expect pre-receive.actual &&
691 test_cmp update.expect update.actual &&
692 test_cmp post-receive.expect post-receive.actual &&
693 test_cmp post-update.expect post-update.actual
694 )
695'
696
697test_expect_success 'deletion of a non-existent ref is not fed to post-receive and post-update hooks' '
698 mk_test_with_hooks testrepo heads/master &&
699 orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
700 newmaster=$(git show-ref -s --verify refs/heads/master) &&
701 git push testrepo master :refs/heads/nonexistent &&
702 (
703 cd testrepo/.git &&
704 cat >pre-receive.expect <<-EOF &&
705 $orgmaster $newmaster refs/heads/master
706 $ZERO_OID $ZERO_OID refs/heads/nonexistent
707 EOF
708
709 cat >update.expect <<-EOF &&
710 refs/heads/master $orgmaster $newmaster
711 refs/heads/nonexistent $ZERO_OID $ZERO_OID
712 EOF
713
714 cat >post-receive.expect <<-EOF &&
715 $orgmaster $newmaster refs/heads/master
716 EOF
717
718 cat >post-update.expect <<-EOF &&
719 refs/heads/master
720 EOF
721
722 test_cmp pre-receive.expect pre-receive.actual &&
723 test_cmp update.expect update.actual &&
724 test_cmp post-receive.expect post-receive.actual &&
725 test_cmp post-update.expect post-update.actual
726 )
727'
728
729test_expect_success 'deletion of a non-existent ref alone does trigger post-receive and post-update hooks' '
730 mk_test_with_hooks testrepo heads/master &&
731 git push testrepo :refs/heads/nonexistent &&
732 (
733 cd testrepo/.git &&
734 cat >pre-receive.expect <<-EOF &&
735 $ZERO_OID $ZERO_OID refs/heads/nonexistent
736 EOF
737
738 cat >update.expect <<-EOF &&
739 refs/heads/nonexistent $ZERO_OID $ZERO_OID
740 EOF
741
742 test_cmp pre-receive.expect pre-receive.actual &&
743 test_cmp update.expect update.actual &&
744 test_path_is_missing post-receive.actual &&
745 test_path_is_missing post-update.actual
746 )
747'
748
749test_expect_success 'mixed ref updates, deletes, invalid deletes trigger hooks with correct input' '
750 mk_test_with_hooks testrepo heads/master heads/next heads/pu &&
751 orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
752 newmaster=$(git show-ref -s --verify refs/heads/master) &&
753 orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
754 newnext=$ZERO_OID &&
755 orgpu=$(cd testrepo && git show-ref -s --verify refs/heads/pu) &&
756 newpu=$(git show-ref -s --verify refs/heads/master) &&
757 git push testrepo refs/heads/master:refs/heads/master \
758 refs/heads/master:refs/heads/pu :refs/heads/next \
759 :refs/heads/nonexistent &&
760 (
761 cd testrepo/.git &&
762 cat >pre-receive.expect <<-EOF &&
763 $orgmaster $newmaster refs/heads/master
764 $orgnext $newnext refs/heads/next
765 $orgpu $newpu refs/heads/pu
766 $ZERO_OID $ZERO_OID refs/heads/nonexistent
767 EOF
768
769 cat >update.expect <<-EOF &&
770 refs/heads/master $orgmaster $newmaster
771 refs/heads/next $orgnext $newnext
772 refs/heads/pu $orgpu $newpu
773 refs/heads/nonexistent $ZERO_OID $ZERO_OID
774 EOF
775
776 cat >post-receive.expect <<-EOF &&
777 $orgmaster $newmaster refs/heads/master
778 $orgnext $newnext refs/heads/next
779 $orgpu $newpu refs/heads/pu
780 EOF
781
782 cat >post-update.expect <<-EOF &&
783 refs/heads/master
784 refs/heads/next
785 refs/heads/pu
786 EOF
787
788 test_cmp pre-receive.expect pre-receive.actual &&
789 test_cmp update.expect update.actual &&
790 test_cmp post-receive.expect post-receive.actual &&
791 test_cmp post-update.expect post-update.actual
792 )
793'
794
795test_expect_success 'allow deleting a ref using --delete' '
796 mk_test testrepo heads/master &&
797 (cd testrepo && git config receive.denyDeleteCurrent warn) &&
798 git push testrepo --delete master &&
799 (cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
800'
801
802test_expect_success 'allow deleting a tag using --delete' '
803 mk_test testrepo heads/master &&
804 git tag -a -m dummy_message deltag heads/master &&
805 git push testrepo --tags &&
806 (cd testrepo && git rev-parse --verify -q refs/tags/deltag) &&
807 git push testrepo --delete tag deltag &&
808 (cd testrepo && test_must_fail git rev-parse --verify refs/tags/deltag)
809'
810
811test_expect_success 'push --delete without args aborts' '
812 mk_test testrepo heads/master &&
813 test_must_fail git push testrepo --delete
814'
815
816test_expect_success 'push --delete refuses src:dest refspecs' '
817 mk_test testrepo heads/master &&
818 test_must_fail git push testrepo --delete master:foo
819'
820
821test_expect_success 'warn on push to HEAD of non-bare repository' '
822 mk_test testrepo heads/master &&
823 (
824 cd testrepo &&
825 git checkout master &&
826 git config receive.denyCurrentBranch warn
827 ) &&
828 git push testrepo master 2>stderr &&
829 grep "warning: updating the current branch" stderr
830'
831
832test_expect_success 'deny push to HEAD of non-bare repository' '
833 mk_test testrepo heads/master &&
834 (
835 cd testrepo &&
836 git checkout master &&
837 git config receive.denyCurrentBranch true
838 ) &&
839 test_must_fail git push testrepo master
840'
841
842test_expect_success 'allow push to HEAD of bare repository (bare)' '
843 mk_test testrepo heads/master &&
844 (
845 cd testrepo &&
846 git checkout master &&
847 git config receive.denyCurrentBranch true &&
848 git config core.bare true
849 ) &&
850 git push testrepo master 2>stderr &&
851 ! grep "warning: updating the current branch" stderr
852'
853
854test_expect_success 'allow push to HEAD of non-bare repository (config)' '
855 mk_test testrepo heads/master &&
856 (
857 cd testrepo &&
858 git checkout master &&
859 git config receive.denyCurrentBranch false
860 ) &&
861 git push testrepo master 2>stderr &&
862 ! grep "warning: updating the current branch" stderr
863'
864
865test_expect_success 'fetch with branches' '
866 mk_empty testrepo &&
867 git branch second $the_first_commit &&
868 git checkout second &&
869 echo ".." > testrepo/.git/branches/branch1 &&
870 (
871 cd testrepo &&
872 git fetch branch1 &&
873 echo "$the_commit commit refs/heads/branch1" >expect &&
874 git for-each-ref refs/heads >actual &&
875 test_cmp expect actual
876 ) &&
877 git checkout master
878'
879
880test_expect_success 'fetch with branches containing #' '
881 mk_empty testrepo &&
882 echo "..#second" > testrepo/.git/branches/branch2 &&
883 (
884 cd testrepo &&
885 git fetch branch2 &&
886 echo "$the_first_commit commit refs/heads/branch2" >expect &&
887 git for-each-ref refs/heads >actual &&
888 test_cmp expect actual
889 ) &&
890 git checkout master
891'
892
893test_expect_success 'push with branches' '
894 mk_empty testrepo &&
895 git checkout second &&
896 echo "testrepo" > .git/branches/branch1 &&
897 git push branch1 &&
898 (
899 cd testrepo &&
900 echo "$the_first_commit commit refs/heads/master" >expect &&
901 git for-each-ref refs/heads >actual &&
902 test_cmp expect actual
903 )
904'
905
906test_expect_success 'push with branches containing #' '
907 mk_empty testrepo &&
908 echo "testrepo#branch3" > .git/branches/branch2 &&
909 git push branch2 &&
910 (
911 cd testrepo &&
912 echo "$the_first_commit commit refs/heads/branch3" >expect &&
913 git for-each-ref refs/heads >actual &&
914 test_cmp expect actual
915 ) &&
916 git checkout master
917'
918
919test_expect_success 'push into aliased refs (consistent)' '
920 mk_test testrepo heads/master &&
921 mk_child testrepo child1 &&
922 mk_child testrepo child2 &&
923 (
924 cd child1 &&
925 git branch foo &&
926 git symbolic-ref refs/heads/bar refs/heads/foo &&
927 git config receive.denyCurrentBranch false
928 ) &&
929 (
930 cd child2 &&
931 >path2 &&
932 git add path2 &&
933 test_tick &&
934 git commit -a -m child2 &&
935 git branch foo &&
936 git branch bar &&
937 git push ../child1 foo bar
938 )
939'
940
941test_expect_success 'push into aliased refs (inconsistent)' '
942 mk_test testrepo heads/master &&
943 mk_child testrepo child1 &&
944 mk_child testrepo child2 &&
945 (
946 cd child1 &&
947 git branch foo &&
948 git symbolic-ref refs/heads/bar refs/heads/foo &&
949 git config receive.denyCurrentBranch false
950 ) &&
951 (
952 cd child2 &&
953 >path2 &&
954 git add path2 &&
955 test_tick &&
956 git commit -a -m child2 &&
957 git branch foo &&
958 >path3 &&
959 git add path3 &&
960 test_tick &&
961 git commit -a -m child2 &&
962 git branch bar &&
963 test_must_fail git push ../child1 foo bar 2>stderr &&
964 grep "refusing inconsistent update" stderr
965 )
966'
967
968test_expect_success 'push requires --force to update lightweight tag' '
969 mk_test testrepo heads/master &&
970 mk_child testrepo child1 &&
971 mk_child testrepo child2 &&
972 (
973 cd child1 &&
974 git tag Tag &&
975 git push ../child2 Tag &&
976 git push ../child2 Tag &&
977 >file1 &&
978 git add file1 &&
979 git commit -m "file1" &&
980 git tag -f Tag &&
981 test_must_fail git push ../child2 Tag &&
982 git push --force ../child2 Tag &&
983 git tag -f Tag &&
984 test_must_fail git push ../child2 Tag HEAD~ &&
985 git push --force ../child2 Tag
986 )
987'
988
989test_expect_success 'push --porcelain' '
990 mk_empty testrepo &&
991 echo >.git/foo "To testrepo" &&
992 echo >>.git/foo "* refs/heads/master:refs/remotes/origin/master [new branch]" &&
993 echo >>.git/foo "Done" &&
994 git push >.git/bar --porcelain testrepo refs/heads/master:refs/remotes/origin/master &&
995 (
996 cd testrepo &&
997 echo "$the_commit commit refs/remotes/origin/master" >expect &&
998 git for-each-ref refs/remotes/origin >actual &&
999 test_cmp expect actual
1000 ) &&
1001 test_cmp .git/foo .git/bar
1002'
1003
1004test_expect_success 'push --porcelain bad url' '
1005 mk_empty testrepo &&
1006 test_must_fail git push >.git/bar --porcelain asdfasdfasd refs/heads/master:refs/remotes/origin/master &&
1007 ! grep -q Done .git/bar
1008'
1009
1010test_expect_success 'push --porcelain rejected' '
1011 mk_empty testrepo &&
1012 git push testrepo refs/heads/master:refs/remotes/origin/master &&
1013 (cd testrepo &&
1014 git reset --hard origin/master^ &&
1015 git config receive.denyCurrentBranch true) &&
1016
1017 echo >.git/foo "To testrepo" &&
1018 echo >>.git/foo "! refs/heads/master:refs/heads/master [remote rejected] (branch is currently checked out)" &&
1019
1020 test_must_fail git push >.git/bar --porcelain testrepo refs/heads/master:refs/heads/master &&
1021 test_cmp .git/foo .git/bar
1022'
1023
1024test_expect_success 'push --porcelain --dry-run rejected' '
1025 mk_empty testrepo &&
1026 git push testrepo refs/heads/master:refs/remotes/origin/master &&
1027 (cd testrepo &&
1028 git reset --hard origin/master &&
1029 git config receive.denyCurrentBranch true) &&
1030
1031 echo >.git/foo "To testrepo" &&
1032 echo >>.git/foo "! refs/heads/master^:refs/heads/master [rejected] (non-fast-forward)" &&
1033 echo >>.git/foo "Done" &&
1034
1035 test_must_fail git push >.git/bar --porcelain --dry-run testrepo refs/heads/master^:refs/heads/master &&
1036 test_cmp .git/foo .git/bar
1037'
1038
1039test_expect_success 'push --prune' '
1040 mk_test testrepo heads/master heads/second heads/foo heads/bar &&
1041 git push --prune testrepo : &&
1042 check_push_result testrepo $the_commit heads/master &&
1043 check_push_result testrepo $the_first_commit heads/second &&
1044 ! check_push_result testrepo $the_first_commit heads/foo heads/bar
1045'
1046
1047test_expect_success 'push --prune refspec' '
1048 mk_test testrepo tmp/master tmp/second tmp/foo tmp/bar &&
1049 git push --prune testrepo "refs/heads/*:refs/tmp/*" &&
1050 check_push_result testrepo $the_commit tmp/master &&
1051 check_push_result testrepo $the_first_commit tmp/second &&
1052 ! check_push_result testrepo $the_first_commit tmp/foo tmp/bar
1053'
1054
1055for configsection in transfer receive
1056do
1057 test_expect_success "push to update a ref hidden by $configsection.hiderefs" '
1058 mk_test testrepo heads/master hidden/one hidden/two hidden/three &&
1059 (
1060 cd testrepo &&
1061 git config $configsection.hiderefs refs/hidden
1062 ) &&
1063
1064 # push to unhidden ref succeeds normally
1065 git push testrepo master:refs/heads/master &&
1066 check_push_result testrepo $the_commit heads/master &&
1067
1068 # push to update a hidden ref should fail
1069 test_must_fail git push testrepo master:refs/hidden/one &&
1070 check_push_result testrepo $the_first_commit hidden/one &&
1071
1072 # push to delete a hidden ref should fail
1073 test_must_fail git push testrepo :refs/hidden/two &&
1074 check_push_result testrepo $the_first_commit hidden/two &&
1075
1076 # idempotent push to update a hidden ref should fail
1077 test_must_fail git push testrepo $the_first_commit:refs/hidden/three &&
1078 check_push_result testrepo $the_first_commit hidden/three
1079 '
1080done
1081
1082test_expect_success 'fetch exact SHA1' '
1083 mk_test testrepo heads/master hidden/one &&
1084 git push testrepo master:refs/hidden/one &&
1085 (
1086 cd testrepo &&
1087 git config transfer.hiderefs refs/hidden
1088 ) &&
1089 check_push_result testrepo $the_commit hidden/one &&
1090
1091 mk_child testrepo child &&
1092 (
1093 cd child &&
1094
1095 # make sure $the_commit does not exist here
1096 git repack -a -d &&
1097 git prune &&
1098 test_must_fail git cat-file -t $the_commit &&
1099
1100 # fetching the hidden object should fail by default
1101 test_must_fail git fetch -v ../testrepo $the_commit:refs/heads/copy 2>err &&
1102 test_i18ngrep "Server does not allow request for unadvertised object" err &&
1103 test_must_fail git rev-parse --verify refs/heads/copy &&
1104
1105 # the server side can allow it to succeed
1106 (
1107 cd ../testrepo &&
1108 git config uploadpack.allowtipsha1inwant true
1109 ) &&
1110
1111 git fetch -v ../testrepo $the_commit:refs/heads/copy master:refs/heads/extra &&
1112 cat >expect <<-EOF &&
1113 $the_commit
1114 $the_first_commit
1115 EOF
1116 {
1117 git rev-parse --verify refs/heads/copy &&
1118 git rev-parse --verify refs/heads/extra
1119 } >actual &&
1120 test_cmp expect actual
1121 )
1122'
1123
1124test_expect_success 'fetch exact SHA1 in protocol v2' '
1125 mk_test testrepo heads/master hidden/one &&
1126 git push testrepo master:refs/hidden/one &&
1127 git -C testrepo config transfer.hiderefs refs/hidden &&
1128 check_push_result testrepo $the_commit hidden/one &&
1129
1130 mk_child testrepo child &&
1131 git -C child config protocol.version 2 &&
1132
1133 # make sure $the_commit does not exist here
1134 git -C child repack -a -d &&
1135 git -C child prune &&
1136 test_must_fail git -C child cat-file -t $the_commit &&
1137
1138 # fetching the hidden object succeeds by default
1139 # NEEDSWORK: should this match the v0 behavior instead?
1140 git -C child fetch -v ../testrepo $the_commit:refs/heads/copy
1141'
1142
1143for configallowtipsha1inwant in true false
1144do
1145 test_expect_success "shallow fetch reachable SHA1 (but not a ref), allowtipsha1inwant=$configallowtipsha1inwant" '
1146 mk_empty testrepo &&
1147 (
1148 cd testrepo &&
1149 git config uploadpack.allowtipsha1inwant $configallowtipsha1inwant &&
1150 git commit --allow-empty -m foo &&
1151 git commit --allow-empty -m bar
1152 ) &&
1153 SHA1=$(git --git-dir=testrepo/.git rev-parse HEAD^) &&
1154 mk_empty shallow &&
1155 (
1156 cd shallow &&
1157 test_must_fail git fetch --depth=1 ../testrepo/.git $SHA1 &&
1158 git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
1159 git fetch --depth=1 ../testrepo/.git $SHA1 &&
1160 git cat-file commit $SHA1
1161 )
1162 '
1163
1164 test_expect_success "deny fetch unreachable SHA1, allowtipsha1inwant=$configallowtipsha1inwant" '
1165 mk_empty testrepo &&
1166 (
1167 cd testrepo &&
1168 git config uploadpack.allowtipsha1inwant $configallowtipsha1inwant &&
1169 git commit --allow-empty -m foo &&
1170 git commit --allow-empty -m bar &&
1171 git commit --allow-empty -m xyz
1172 ) &&
1173 SHA1_1=$(git --git-dir=testrepo/.git rev-parse HEAD^^) &&
1174 SHA1_2=$(git --git-dir=testrepo/.git rev-parse HEAD^) &&
1175 SHA1_3=$(git --git-dir=testrepo/.git rev-parse HEAD) &&
1176 (
1177 cd testrepo &&
1178 git reset --hard $SHA1_2 &&
1179 git cat-file commit $SHA1_1 &&
1180 git cat-file commit $SHA1_3
1181 ) &&
1182 mk_empty shallow &&
1183 (
1184 cd shallow &&
1185 test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_3 &&
1186 test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_1 &&
1187 git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
1188 git fetch ../testrepo/.git $SHA1_1 &&
1189 git cat-file commit $SHA1_1 &&
1190 test_must_fail git cat-file commit $SHA1_2 &&
1191 git fetch ../testrepo/.git $SHA1_2 &&
1192 git cat-file commit $SHA1_2 &&
1193 test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_3
1194 )
1195 '
1196done
1197
1198test_expect_success 'fetch follows tags by default' '
1199 mk_test testrepo heads/master &&
1200 rm -fr src dst &&
1201 git init src &&
1202 (
1203 cd src &&
1204 git pull ../testrepo master &&
1205 git tag -m "annotated" tag &&
1206 git for-each-ref >tmp1 &&
1207 (
1208 cat tmp1
1209 sed -n "s|refs/heads/master$|refs/remotes/origin/master|p" tmp1
1210 ) |
1211 sort -k 3 >../expect
1212 ) &&
1213 git init dst &&
1214 (
1215 cd dst &&
1216 git remote add origin ../src &&
1217 git config branch.master.remote origin &&
1218 git config branch.master.merge refs/heads/master &&
1219 git pull &&
1220 git for-each-ref >../actual
1221 ) &&
1222 test_cmp expect actual
1223'
1224
1225test_expect_success 'pushing a specific ref applies remote.$name.push as refmap' '
1226 mk_test testrepo heads/master &&
1227 rm -fr src dst &&
1228 git init src &&
1229 git init --bare dst &&
1230 (
1231 cd src &&
1232 git pull ../testrepo master &&
1233 git branch next &&
1234 git config remote.dst.url ../dst &&
1235 git config remote.dst.push "+refs/heads/*:refs/remotes/src/*" &&
1236 git push dst master &&
1237 git show-ref refs/heads/master |
1238 sed -e "s|refs/heads/|refs/remotes/src/|" >../dst/expect
1239 ) &&
1240 (
1241 cd dst &&
1242 test_must_fail git show-ref refs/heads/next &&
1243 test_must_fail git show-ref refs/heads/master &&
1244 git show-ref refs/remotes/src/master >actual
1245 ) &&
1246 test_cmp dst/expect dst/actual
1247'
1248
1249test_expect_success 'with no remote.$name.push, it is not used as refmap' '
1250 mk_test testrepo heads/master &&
1251 rm -fr src dst &&
1252 git init src &&
1253 git init --bare dst &&
1254 (
1255 cd src &&
1256 git pull ../testrepo master &&
1257 git branch next &&
1258 git config remote.dst.url ../dst &&
1259 git config push.default matching &&
1260 git push dst master &&
1261 git show-ref refs/heads/master >../dst/expect
1262 ) &&
1263 (
1264 cd dst &&
1265 test_must_fail git show-ref refs/heads/next &&
1266 git show-ref refs/heads/master >actual
1267 ) &&
1268 test_cmp dst/expect dst/actual
1269'
1270
1271test_expect_success 'with no remote.$name.push, upstream mapping is used' '
1272 mk_test testrepo heads/master &&
1273 rm -fr src dst &&
1274 git init src &&
1275 git init --bare dst &&
1276 (
1277 cd src &&
1278 git pull ../testrepo master &&
1279 git branch next &&
1280 git config remote.dst.url ../dst &&
1281 git config remote.dst.fetch "+refs/heads/*:refs/remotes/dst/*" &&
1282 git config push.default upstream &&
1283
1284 git config branch.master.merge refs/heads/trunk &&
1285 git config branch.master.remote dst &&
1286
1287 git push dst master &&
1288 git show-ref refs/heads/master |
1289 sed -e "s|refs/heads/master|refs/heads/trunk|" >../dst/expect
1290 ) &&
1291 (
1292 cd dst &&
1293 test_must_fail git show-ref refs/heads/master &&
1294 test_must_fail git show-ref refs/heads/next &&
1295 git show-ref refs/heads/trunk >actual
1296 ) &&
1297 test_cmp dst/expect dst/actual
1298'
1299
1300test_expect_success 'push does not follow tags by default' '
1301 mk_test testrepo heads/master &&
1302 rm -fr src dst &&
1303 git init src &&
1304 git init --bare dst &&
1305 (
1306 cd src &&
1307 git pull ../testrepo master &&
1308 git tag -m "annotated" tag &&
1309 git checkout -b another &&
1310 git commit --allow-empty -m "future commit" &&
1311 git tag -m "future" future &&
1312 git checkout master &&
1313 git for-each-ref refs/heads/master >../expect &&
1314 git push ../dst master
1315 ) &&
1316 (
1317 cd dst &&
1318 git for-each-ref >../actual
1319 ) &&
1320 test_cmp expect actual
1321'
1322
1323test_expect_success 'push --follow-tag only pushes relevant tags' '
1324 mk_test testrepo heads/master &&
1325 rm -fr src dst &&
1326 git init src &&
1327 git init --bare dst &&
1328 (
1329 cd src &&
1330 git pull ../testrepo master &&
1331 git tag -m "annotated" tag &&
1332 git checkout -b another &&
1333 git commit --allow-empty -m "future commit" &&
1334 git tag -m "future" future &&
1335 git checkout master &&
1336 git for-each-ref refs/heads/master refs/tags/tag >../expect &&
1337 git push --follow-tag ../dst master
1338 ) &&
1339 (
1340 cd dst &&
1341 git for-each-ref >../actual
1342 ) &&
1343 test_cmp expect actual
1344'
1345
1346test_expect_success 'push --no-thin must produce non-thin pack' '
1347 cat >>path1 <<\EOF &&
1348keep base version of path1 big enough, compared to the new changes
1349later, in order to pass size heuristics in
1350builtin/pack-objects.c:try_delta()
1351EOF
1352 git commit -am initial &&
1353 git init no-thin &&
1354 git --git-dir=no-thin/.git config receive.unpacklimit 0 &&
1355 git push no-thin/.git refs/heads/master:refs/heads/foo &&
1356 echo modified >> path1 &&
1357 git commit -am modified &&
1358 git repack -adf &&
1359 rcvpck="git receive-pack --reject-thin-pack-for-testing" &&
1360 git push --no-thin --receive-pack="$rcvpck" no-thin/.git refs/heads/master:refs/heads/foo
1361'
1362
1363test_expect_success 'pushing a tag pushes the tagged object' '
1364 rm -rf dst.git &&
1365 blob=$(echo unreferenced | git hash-object -w --stdin) &&
1366 git tag -m foo tag-of-blob $blob &&
1367 git init --bare dst.git &&
1368 git push dst.git tag-of-blob &&
1369 # the receiving index-pack should have noticed
1370 # any problems, but we double check
1371 echo unreferenced >expect &&
1372 git --git-dir=dst.git cat-file blob tag-of-blob >actual &&
1373 test_cmp expect actual
1374'
1375
1376test_expect_success 'push into bare respects core.logallrefupdates' '
1377 rm -rf dst.git &&
1378 git init --bare dst.git &&
1379 git -C dst.git config core.logallrefupdates true &&
1380
1381 # double push to test both with and without
1382 # the actual pack transfer
1383 git push dst.git master:one &&
1384 echo "one@{0} push" >expect &&
1385 git -C dst.git log -g --format="%gd %gs" one >actual &&
1386 test_cmp expect actual &&
1387
1388 git push dst.git master:two &&
1389 echo "two@{0} push" >expect &&
1390 git -C dst.git log -g --format="%gd %gs" two >actual &&
1391 test_cmp expect actual
1392'
1393
1394test_expect_success 'fetch into bare respects core.logallrefupdates' '
1395 rm -rf dst.git &&
1396 git init --bare dst.git &&
1397 (
1398 cd dst.git &&
1399 git config core.logallrefupdates true &&
1400
1401 # as above, we double-fetch to test both
1402 # with and without pack transfer
1403 git fetch .. master:one &&
1404 echo "one@{0} fetch .. master:one: storing head" >expect &&
1405 git log -g --format="%gd %gs" one >actual &&
1406 test_cmp expect actual &&
1407
1408 git fetch .. master:two &&
1409 echo "two@{0} fetch .. master:two: storing head" >expect &&
1410 git log -g --format="%gd %gs" two >actual &&
1411 test_cmp expect actual
1412 )
1413'
1414
1415test_expect_success 'receive.denyCurrentBranch = updateInstead' '
1416 git push testrepo master &&
1417 (
1418 cd testrepo &&
1419 git reset --hard &&
1420 git config receive.denyCurrentBranch updateInstead
1421 ) &&
1422 test_commit third path2 &&
1423
1424 # Try pushing into a repository with pristine working tree
1425 git push testrepo master &&
1426 (
1427 cd testrepo &&
1428 git update-index -q --refresh &&
1429 git diff-files --quiet -- &&
1430 git diff-index --quiet --cached HEAD -- &&
1431 test third = "$(cat path2)" &&
1432 test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
1433 ) &&
1434
1435 # Try pushing into a repository with working tree needing a refresh
1436 (
1437 cd testrepo &&
1438 git reset --hard HEAD^ &&
1439 test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
1440 test-tool chmtime +100 path1
1441 ) &&
1442 git push testrepo master &&
1443 (
1444 cd testrepo &&
1445 git update-index -q --refresh &&
1446 git diff-files --quiet -- &&
1447 git diff-index --quiet --cached HEAD -- &&
1448 test_cmp ../path1 path1 &&
1449 test third = "$(cat path2)" &&
1450 test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
1451 ) &&
1452
1453 # Update what is to be pushed
1454 test_commit fourth path2 &&
1455
1456 # Try pushing into a repository with a dirty working tree
1457 # (1) the working tree updated
1458 (
1459 cd testrepo &&
1460 echo changed >path1
1461 ) &&
1462 test_must_fail git push testrepo master &&
1463 (
1464 cd testrepo &&
1465 test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
1466 git diff --quiet --cached &&
1467 test changed = "$(cat path1)"
1468 ) &&
1469
1470 # (2) the index updated
1471 (
1472 cd testrepo &&
1473 echo changed >path1 &&
1474 git add path1
1475 ) &&
1476 test_must_fail git push testrepo master &&
1477 (
1478 cd testrepo &&
1479 test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
1480 git diff --quiet &&
1481 test changed = "$(cat path1)"
1482 ) &&
1483
1484 # Introduce a new file in the update
1485 test_commit fifth path3 &&
1486
1487 # (3) the working tree has an untracked file that would interfere
1488 (
1489 cd testrepo &&
1490 git reset --hard &&
1491 echo changed >path3
1492 ) &&
1493 test_must_fail git push testrepo master &&
1494 (
1495 cd testrepo &&
1496 test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) &&
1497 git diff --quiet &&
1498 git diff --quiet --cached &&
1499 test changed = "$(cat path3)"
1500 ) &&
1501
1502 # (4) the target changes to what gets pushed but it still is a change
1503 (
1504 cd testrepo &&
1505 git reset --hard &&
1506 echo fifth >path3 &&
1507 git add path3
1508 ) &&
1509 test_must_fail git push testrepo master &&
1510 (
1511 cd testrepo &&
1512 test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) &&
1513 git diff --quiet &&
1514 test fifth = "$(cat path3)"
1515 ) &&
1516
1517 # (5) push into void
1518 rm -fr void &&
1519 git init void &&
1520 (
1521 cd void &&
1522 git config receive.denyCurrentBranch updateInstead
1523 ) &&
1524 git push void master &&
1525 (
1526 cd void &&
1527 test $(git -C .. rev-parse master) = $(git rev-parse HEAD) &&
1528 git diff --quiet &&
1529 git diff --cached --quiet
1530 )
1531'
1532
1533test_expect_success 'updateInstead with push-to-checkout hook' '
1534 rm -fr testrepo &&
1535 git init testrepo &&
1536 (
1537 cd testrepo &&
1538 git pull .. master &&
1539 git reset --hard HEAD^^ &&
1540 git tag initial &&
1541 git config receive.denyCurrentBranch updateInstead &&
1542 write_script .git/hooks/push-to-checkout <<-\EOF
1543 echo >&2 updating from $(git rev-parse HEAD)
1544 echo >&2 updating to "$1"
1545
1546 git update-index -q --refresh &&
1547 git read-tree -u -m HEAD "$1" || {
1548 status=$?
1549 echo >&2 read-tree failed
1550 exit $status
1551 }
1552 EOF
1553 ) &&
1554
1555 # Try pushing into a pristine
1556 git push testrepo master &&
1557 (
1558 cd testrepo &&
1559 git diff --quiet &&
1560 git diff HEAD --quiet &&
1561 test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
1562 ) &&
1563
1564 # Try pushing into a repository with conflicting change
1565 (
1566 cd testrepo &&
1567 git reset --hard initial &&
1568 echo conflicting >path2
1569 ) &&
1570 test_must_fail git push testrepo master &&
1571 (
1572 cd testrepo &&
1573 test $(git rev-parse initial) = $(git rev-parse HEAD) &&
1574 test conflicting = "$(cat path2)" &&
1575 git diff-index --quiet --cached HEAD
1576 ) &&
1577
1578 # Try pushing into a repository with unrelated change
1579 (
1580 cd testrepo &&
1581 git reset --hard initial &&
1582 echo unrelated >path1 &&
1583 echo irrelevant >path5 &&
1584 git add path5
1585 ) &&
1586 git push testrepo master &&
1587 (
1588 cd testrepo &&
1589 test "$(cat path1)" = unrelated &&
1590 test "$(cat path5)" = irrelevant &&
1591 test "$(git diff --name-only --cached HEAD)" = path5 &&
1592 test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
1593 ) &&
1594
1595 # push into void
1596 rm -fr void &&
1597 git init void &&
1598 (
1599 cd void &&
1600 git config receive.denyCurrentBranch updateInstead &&
1601 write_script .git/hooks/push-to-checkout <<-\EOF
1602 if git rev-parse --quiet --verify HEAD
1603 then
1604 has_head=yes
1605 echo >&2 updating from $(git rev-parse HEAD)
1606 else
1607 has_head=no
1608 echo >&2 pushing into void
1609 fi
1610 echo >&2 updating to "$1"
1611
1612 git update-index -q --refresh &&
1613 case "$has_head" in
1614 yes)
1615 git read-tree -u -m HEAD "$1" ;;
1616 no)
1617 git read-tree -u -m "$1" ;;
1618 esac || {
1619 status=$?
1620 echo >&2 read-tree failed
1621 exit $status
1622 }
1623 EOF
1624 ) &&
1625
1626 git push void master &&
1627 (
1628 cd void &&
1629 git diff --quiet &&
1630 git diff --cached --quiet &&
1631 test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
1632 )
1633'
1634
1635test_done