Merge branch 'en/incl-forward-decl'
[git] / t / t5516-fetch-push.sh
1 #!/bin/sh
2
3 test_description='Basic fetch/push functionality.
4
5 This 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
19 D=$(pwd)
20
21 mk_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
33 mk_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
56 mk_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
91 mk_child() {
92         rm -rf "$2" &&
93         git clone "$1" "$2"
94 }
95
96 check_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
117 test_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
133 test_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
145 test_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
159 test_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
175 test_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
191 test_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
203 test_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
215 test_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
228 test_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
241 test_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
256 test_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
264 test_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
272 test_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
283 test_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
294 test_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
305 test_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
313 test_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
321 test_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
331 test_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
340 test_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
349 test_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
357 test_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
367 test_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
381 test_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
394 test_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
408 test_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
416 test_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
425 test_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
432 test_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
439 test_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
448 test_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
456 test_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
477 test_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
486 test_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
504 test_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
517 test_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
527 test_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
543 test_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
556 test_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
564 test_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
578 test_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
594 test_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
606 test_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
623 test_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
632 test_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
668 test_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
697 test_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
729 test_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
749 test_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
795 test_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
802 test_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
811 test_expect_success 'push --delete without args aborts' '
812         mk_test testrepo heads/master &&
813         test_must_fail git push testrepo --delete
814 '
815
816 test_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
821 test_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
832 test_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
842 test_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
854 test_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
865 test_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
880 test_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
893 test_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
906 test_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
919 test_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
941 test_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
968 test_force_push_tag () {
969         tag_type_description=$1
970         tag_args=$2
971
972         test_expect_success 'force pushing required to update lightweight tag' "
973                 mk_test testrepo heads/master &&
974                 mk_child testrepo child1 &&
975                 mk_child testrepo child2 &&
976                 (
977                         cd child1 &&
978                         git tag testTag &&
979                         git push ../child2 testTag &&
980                         >file1 &&
981                         git add file1 &&
982                         git commit -m 'file1' &&
983                         git tag $tag_args testTag &&
984                         test_must_fail git push ../child2 testTag &&
985                         git push --force ../child2 testTag &&
986                         git tag $tag_args testTag HEAD~ &&
987                         test_must_fail git push ../child2 testTag &&
988                         git push --force ../child2 testTag &&
989
990                         # Clobbering without + in refspec needs --force
991                         git tag -f testTag &&
992                         test_must_fail git push ../child2 'refs/tags/*:refs/tags/*' &&
993                         git push --force ../child2 'refs/tags/*:refs/tags/*' &&
994
995                         # Clobbering with + in refspec does not need --force
996                         git tag -f testTag HEAD~ &&
997                         git push ../child2 '+refs/tags/*:refs/tags/*' &&
998
999                         # Clobbering with --no-force still obeys + in refspec
1000                         git tag -f testTag &&
1001                         git push --no-force ../child2 '+refs/tags/*:refs/tags/*' &&
1002
1003                         # Clobbering with/without --force and 'tag <name>' format
1004                         git tag -f testTag HEAD~ &&
1005                         test_must_fail git push ../child2 tag testTag &&
1006                         git push --force ../child2 tag testTag
1007                 )
1008         "
1009 }
1010
1011 test_force_push_tag "lightweight tag" "-f"
1012 test_force_push_tag "annotated tag" "-f -a -m'msg'"
1013
1014 test_expect_success 'push --porcelain' '
1015         mk_empty testrepo &&
1016         echo >.git/foo  "To testrepo" &&
1017         echo >>.git/foo "*      refs/heads/master:refs/remotes/origin/master    [new branch]"  &&
1018         echo >>.git/foo "Done" &&
1019         git push >.git/bar --porcelain  testrepo refs/heads/master:refs/remotes/origin/master &&
1020         (
1021                 cd testrepo &&
1022                 echo "$the_commit commit        refs/remotes/origin/master" >expect &&
1023                 git for-each-ref refs/remotes/origin >actual &&
1024                 test_cmp expect actual
1025         ) &&
1026         test_cmp .git/foo .git/bar
1027 '
1028
1029 test_expect_success 'push --porcelain bad url' '
1030         mk_empty testrepo &&
1031         test_must_fail git push >.git/bar --porcelain asdfasdfasd refs/heads/master:refs/remotes/origin/master &&
1032         ! grep -q Done .git/bar
1033 '
1034
1035 test_expect_success 'push --porcelain rejected' '
1036         mk_empty testrepo &&
1037         git push testrepo refs/heads/master:refs/remotes/origin/master &&
1038         (cd testrepo &&
1039                 git reset --hard origin/master^ &&
1040                 git config receive.denyCurrentBranch true) &&
1041
1042         echo >.git/foo  "To testrepo"  &&
1043         echo >>.git/foo "!      refs/heads/master:refs/heads/master     [remote rejected] (branch is currently checked out)" &&
1044
1045         test_must_fail git push >.git/bar --porcelain  testrepo refs/heads/master:refs/heads/master &&
1046         test_cmp .git/foo .git/bar
1047 '
1048
1049 test_expect_success 'push --porcelain --dry-run rejected' '
1050         mk_empty testrepo &&
1051         git push testrepo refs/heads/master:refs/remotes/origin/master &&
1052         (cd testrepo &&
1053                 git reset --hard origin/master &&
1054                 git config receive.denyCurrentBranch true) &&
1055
1056         echo >.git/foo  "To testrepo"  &&
1057         echo >>.git/foo "!      refs/heads/master^:refs/heads/master    [rejected] (non-fast-forward)" &&
1058         echo >>.git/foo "Done" &&
1059
1060         test_must_fail git push >.git/bar --porcelain  --dry-run testrepo refs/heads/master^:refs/heads/master &&
1061         test_cmp .git/foo .git/bar
1062 '
1063
1064 test_expect_success 'push --prune' '
1065         mk_test testrepo heads/master heads/second heads/foo heads/bar &&
1066         git push --prune testrepo : &&
1067         check_push_result testrepo $the_commit heads/master &&
1068         check_push_result testrepo $the_first_commit heads/second &&
1069         ! check_push_result testrepo $the_first_commit heads/foo heads/bar
1070 '
1071
1072 test_expect_success 'push --prune refspec' '
1073         mk_test testrepo tmp/master tmp/second tmp/foo tmp/bar &&
1074         git push --prune testrepo "refs/heads/*:refs/tmp/*" &&
1075         check_push_result testrepo $the_commit tmp/master &&
1076         check_push_result testrepo $the_first_commit tmp/second &&
1077         ! check_push_result testrepo $the_first_commit tmp/foo tmp/bar
1078 '
1079
1080 for configsection in transfer receive
1081 do
1082         test_expect_success "push to update a ref hidden by $configsection.hiderefs" '
1083                 mk_test testrepo heads/master hidden/one hidden/two hidden/three &&
1084                 (
1085                         cd testrepo &&
1086                         git config $configsection.hiderefs refs/hidden
1087                 ) &&
1088
1089                 # push to unhidden ref succeeds normally
1090                 git push testrepo master:refs/heads/master &&
1091                 check_push_result testrepo $the_commit heads/master &&
1092
1093                 # push to update a hidden ref should fail
1094                 test_must_fail git push testrepo master:refs/hidden/one &&
1095                 check_push_result testrepo $the_first_commit hidden/one &&
1096
1097                 # push to delete a hidden ref should fail
1098                 test_must_fail git push testrepo :refs/hidden/two &&
1099                 check_push_result testrepo $the_first_commit hidden/two &&
1100
1101                 # idempotent push to update a hidden ref should fail
1102                 test_must_fail git push testrepo $the_first_commit:refs/hidden/three &&
1103                 check_push_result testrepo $the_first_commit hidden/three
1104         '
1105 done
1106
1107 test_expect_success 'fetch exact SHA1' '
1108         mk_test testrepo heads/master hidden/one &&
1109         git push testrepo master:refs/hidden/one &&
1110         (
1111                 cd testrepo &&
1112                 git config transfer.hiderefs refs/hidden
1113         ) &&
1114         check_push_result testrepo $the_commit hidden/one &&
1115
1116         mk_child testrepo child &&
1117         (
1118                 cd child &&
1119
1120                 # make sure $the_commit does not exist here
1121                 git repack -a -d &&
1122                 git prune &&
1123                 test_must_fail git cat-file -t $the_commit &&
1124
1125                 # fetching the hidden object should fail by default
1126                 test_must_fail git fetch -v ../testrepo $the_commit:refs/heads/copy 2>err &&
1127                 test_i18ngrep "Server does not allow request for unadvertised object" err &&
1128                 test_must_fail git rev-parse --verify refs/heads/copy &&
1129
1130                 # the server side can allow it to succeed
1131                 (
1132                         cd ../testrepo &&
1133                         git config uploadpack.allowtipsha1inwant true
1134                 ) &&
1135
1136                 git fetch -v ../testrepo $the_commit:refs/heads/copy master:refs/heads/extra &&
1137                 cat >expect <<-EOF &&
1138                 $the_commit
1139                 $the_first_commit
1140                 EOF
1141                 {
1142                         git rev-parse --verify refs/heads/copy &&
1143                         git rev-parse --verify refs/heads/extra
1144                 } >actual &&
1145                 test_cmp expect actual
1146         )
1147 '
1148
1149 test_expect_success 'fetch exact SHA1 in protocol v2' '
1150         mk_test testrepo heads/master hidden/one &&
1151         git push testrepo master:refs/hidden/one &&
1152         git -C testrepo config transfer.hiderefs refs/hidden &&
1153         check_push_result testrepo $the_commit hidden/one &&
1154
1155         mk_child testrepo child &&
1156         git -C child config protocol.version 2 &&
1157
1158         # make sure $the_commit does not exist here
1159         git -C child repack -a -d &&
1160         git -C child prune &&
1161         test_must_fail git -C child cat-file -t $the_commit &&
1162
1163         # fetching the hidden object succeeds by default
1164         # NEEDSWORK: should this match the v0 behavior instead?
1165         git -C child fetch -v ../testrepo $the_commit:refs/heads/copy
1166 '
1167
1168 for configallowtipsha1inwant in true false
1169 do
1170         test_expect_success "shallow fetch reachable SHA1 (but not a ref), allowtipsha1inwant=$configallowtipsha1inwant" '
1171                 mk_empty testrepo &&
1172                 (
1173                         cd testrepo &&
1174                         git config uploadpack.allowtipsha1inwant $configallowtipsha1inwant &&
1175                         git commit --allow-empty -m foo &&
1176                         git commit --allow-empty -m bar
1177                 ) &&
1178                 SHA1=$(git --git-dir=testrepo/.git rev-parse HEAD^) &&
1179                 mk_empty shallow &&
1180                 (
1181                         cd shallow &&
1182                         test_must_fail git fetch --depth=1 ../testrepo/.git $SHA1 &&
1183                         git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
1184                         git fetch --depth=1 ../testrepo/.git $SHA1 &&
1185                         git cat-file commit $SHA1
1186                 )
1187         '
1188
1189         test_expect_success "deny fetch unreachable SHA1, allowtipsha1inwant=$configallowtipsha1inwant" '
1190                 mk_empty testrepo &&
1191                 (
1192                         cd testrepo &&
1193                         git config uploadpack.allowtipsha1inwant $configallowtipsha1inwant &&
1194                         git commit --allow-empty -m foo &&
1195                         git commit --allow-empty -m bar &&
1196                         git commit --allow-empty -m xyz
1197                 ) &&
1198                 SHA1_1=$(git --git-dir=testrepo/.git rev-parse HEAD^^) &&
1199                 SHA1_2=$(git --git-dir=testrepo/.git rev-parse HEAD^) &&
1200                 SHA1_3=$(git --git-dir=testrepo/.git rev-parse HEAD) &&
1201                 (
1202                         cd testrepo &&
1203                         git reset --hard $SHA1_2 &&
1204                         git cat-file commit $SHA1_1 &&
1205                         git cat-file commit $SHA1_3
1206                 ) &&
1207                 mk_empty shallow &&
1208                 (
1209                         cd shallow &&
1210                         test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_3 &&
1211                         test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_1 &&
1212                         git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
1213                         git fetch ../testrepo/.git $SHA1_1 &&
1214                         git cat-file commit $SHA1_1 &&
1215                         test_must_fail git cat-file commit $SHA1_2 &&
1216                         git fetch ../testrepo/.git $SHA1_2 &&
1217                         git cat-file commit $SHA1_2 &&
1218                         test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_3
1219                 )
1220         '
1221 done
1222
1223 test_expect_success 'fetch follows tags by default' '
1224         mk_test testrepo heads/master &&
1225         rm -fr src dst &&
1226         git init src &&
1227         (
1228                 cd src &&
1229                 git pull ../testrepo master &&
1230                 git tag -m "annotated" tag &&
1231                 git for-each-ref >tmp1 &&
1232                 (
1233                         cat tmp1
1234                         sed -n "s|refs/heads/master$|refs/remotes/origin/master|p" tmp1
1235                 ) |
1236                 sort -k 3 >../expect
1237         ) &&
1238         git init dst &&
1239         (
1240                 cd dst &&
1241                 git remote add origin ../src &&
1242                 git config branch.master.remote origin &&
1243                 git config branch.master.merge refs/heads/master &&
1244                 git pull &&
1245                 git for-each-ref >../actual
1246         ) &&
1247         test_cmp expect actual
1248 '
1249
1250 test_expect_success 'pushing a specific ref applies remote.$name.push as refmap' '
1251         mk_test testrepo heads/master &&
1252         rm -fr src dst &&
1253         git init src &&
1254         git init --bare dst &&
1255         (
1256                 cd src &&
1257                 git pull ../testrepo master &&
1258                 git branch next &&
1259                 git config remote.dst.url ../dst &&
1260                 git config remote.dst.push "+refs/heads/*:refs/remotes/src/*" &&
1261                 git push dst master &&
1262                 git show-ref refs/heads/master |
1263                 sed -e "s|refs/heads/|refs/remotes/src/|" >../dst/expect
1264         ) &&
1265         (
1266                 cd dst &&
1267                 test_must_fail git show-ref refs/heads/next &&
1268                 test_must_fail git show-ref refs/heads/master &&
1269                 git show-ref refs/remotes/src/master >actual
1270         ) &&
1271         test_cmp dst/expect dst/actual
1272 '
1273
1274 test_expect_success 'with no remote.$name.push, it is not used as refmap' '
1275         mk_test testrepo heads/master &&
1276         rm -fr src dst &&
1277         git init src &&
1278         git init --bare dst &&
1279         (
1280                 cd src &&
1281                 git pull ../testrepo master &&
1282                 git branch next &&
1283                 git config remote.dst.url ../dst &&
1284                 git config push.default matching &&
1285                 git push dst master &&
1286                 git show-ref refs/heads/master >../dst/expect
1287         ) &&
1288         (
1289                 cd dst &&
1290                 test_must_fail git show-ref refs/heads/next &&
1291                 git show-ref refs/heads/master >actual
1292         ) &&
1293         test_cmp dst/expect dst/actual
1294 '
1295
1296 test_expect_success 'with no remote.$name.push, upstream mapping is used' '
1297         mk_test testrepo heads/master &&
1298         rm -fr src dst &&
1299         git init src &&
1300         git init --bare dst &&
1301         (
1302                 cd src &&
1303                 git pull ../testrepo master &&
1304                 git branch next &&
1305                 git config remote.dst.url ../dst &&
1306                 git config remote.dst.fetch "+refs/heads/*:refs/remotes/dst/*" &&
1307                 git config push.default upstream &&
1308
1309                 git config branch.master.merge refs/heads/trunk &&
1310                 git config branch.master.remote dst &&
1311
1312                 git push dst master &&
1313                 git show-ref refs/heads/master |
1314                 sed -e "s|refs/heads/master|refs/heads/trunk|" >../dst/expect
1315         ) &&
1316         (
1317                 cd dst &&
1318                 test_must_fail git show-ref refs/heads/master &&
1319                 test_must_fail git show-ref refs/heads/next &&
1320                 git show-ref refs/heads/trunk >actual
1321         ) &&
1322         test_cmp dst/expect dst/actual
1323 '
1324
1325 test_expect_success 'push does not follow tags by default' '
1326         mk_test testrepo heads/master &&
1327         rm -fr src dst &&
1328         git init src &&
1329         git init --bare dst &&
1330         (
1331                 cd src &&
1332                 git pull ../testrepo master &&
1333                 git tag -m "annotated" tag &&
1334                 git checkout -b another &&
1335                 git commit --allow-empty -m "future commit" &&
1336                 git tag -m "future" future &&
1337                 git checkout master &&
1338                 git for-each-ref refs/heads/master >../expect &&
1339                 git push ../dst master
1340         ) &&
1341         (
1342                 cd dst &&
1343                 git for-each-ref >../actual
1344         ) &&
1345         test_cmp expect actual
1346 '
1347
1348 test_expect_success 'push --follow-tag only pushes relevant tags' '
1349         mk_test testrepo heads/master &&
1350         rm -fr src dst &&
1351         git init src &&
1352         git init --bare dst &&
1353         (
1354                 cd src &&
1355                 git pull ../testrepo master &&
1356                 git tag -m "annotated" tag &&
1357                 git checkout -b another &&
1358                 git commit --allow-empty -m "future commit" &&
1359                 git tag -m "future" future &&
1360                 git checkout master &&
1361                 git for-each-ref refs/heads/master refs/tags/tag >../expect &&
1362                 git push --follow-tag ../dst master
1363         ) &&
1364         (
1365                 cd dst &&
1366                 git for-each-ref >../actual
1367         ) &&
1368         test_cmp expect actual
1369 '
1370
1371 test_expect_success 'push --no-thin must produce non-thin pack' '
1372         cat >>path1 <<\EOF &&
1373 keep base version of path1 big enough, compared to the new changes
1374 later, in order to pass size heuristics in
1375 builtin/pack-objects.c:try_delta()
1376 EOF
1377         git commit -am initial &&
1378         git init no-thin &&
1379         git --git-dir=no-thin/.git config receive.unpacklimit 0 &&
1380         git push no-thin/.git refs/heads/master:refs/heads/foo &&
1381         echo modified >> path1 &&
1382         git commit -am modified &&
1383         git repack -adf &&
1384         rcvpck="git receive-pack --reject-thin-pack-for-testing" &&
1385         git push --no-thin --receive-pack="$rcvpck" no-thin/.git refs/heads/master:refs/heads/foo
1386 '
1387
1388 test_expect_success 'pushing a tag pushes the tagged object' '
1389         rm -rf dst.git &&
1390         blob=$(echo unreferenced | git hash-object -w --stdin) &&
1391         git tag -m foo tag-of-blob $blob &&
1392         git init --bare dst.git &&
1393         git push dst.git tag-of-blob &&
1394         # the receiving index-pack should have noticed
1395         # any problems, but we double check
1396         echo unreferenced >expect &&
1397         git --git-dir=dst.git cat-file blob tag-of-blob >actual &&
1398         test_cmp expect actual
1399 '
1400
1401 test_expect_success 'push into bare respects core.logallrefupdates' '
1402         rm -rf dst.git &&
1403         git init --bare dst.git &&
1404         git -C dst.git config core.logallrefupdates true &&
1405
1406         # double push to test both with and without
1407         # the actual pack transfer
1408         git push dst.git master:one &&
1409         echo "one@{0} push" >expect &&
1410         git -C dst.git log -g --format="%gd %gs" one >actual &&
1411         test_cmp expect actual &&
1412
1413         git push dst.git master:two &&
1414         echo "two@{0} push" >expect &&
1415         git -C dst.git log -g --format="%gd %gs" two >actual &&
1416         test_cmp expect actual
1417 '
1418
1419 test_expect_success 'fetch into bare respects core.logallrefupdates' '
1420         rm -rf dst.git &&
1421         git init --bare dst.git &&
1422         (
1423                 cd dst.git &&
1424                 git config core.logallrefupdates true &&
1425
1426                 # as above, we double-fetch to test both
1427                 # with and without pack transfer
1428                 git fetch .. master:one &&
1429                 echo "one@{0} fetch .. master:one: storing head" >expect &&
1430                 git log -g --format="%gd %gs" one >actual &&
1431                 test_cmp expect actual &&
1432
1433                 git fetch .. master:two &&
1434                 echo "two@{0} fetch .. master:two: storing head" >expect &&
1435                 git log -g --format="%gd %gs" two >actual &&
1436                 test_cmp expect actual
1437         )
1438 '
1439
1440 test_expect_success 'receive.denyCurrentBranch = updateInstead' '
1441         git push testrepo master &&
1442         (
1443                 cd testrepo &&
1444                 git reset --hard &&
1445                 git config receive.denyCurrentBranch updateInstead
1446         ) &&
1447         test_commit third path2 &&
1448
1449         # Try pushing into a repository with pristine working tree
1450         git push testrepo master &&
1451         (
1452                 cd testrepo &&
1453                 git update-index -q --refresh &&
1454                 git diff-files --quiet -- &&
1455                 git diff-index --quiet --cached HEAD -- &&
1456                 test third = "$(cat path2)" &&
1457                 test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
1458         ) &&
1459
1460         # Try pushing into a repository with working tree needing a refresh
1461         (
1462                 cd testrepo &&
1463                 git reset --hard HEAD^ &&
1464                 test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
1465                 test-tool chmtime +100 path1
1466         ) &&
1467         git push testrepo master &&
1468         (
1469                 cd testrepo &&
1470                 git update-index -q --refresh &&
1471                 git diff-files --quiet -- &&
1472                 git diff-index --quiet --cached HEAD -- &&
1473                 test_cmp ../path1 path1 &&
1474                 test third = "$(cat path2)" &&
1475                 test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
1476         ) &&
1477
1478         # Update what is to be pushed
1479         test_commit fourth path2 &&
1480
1481         # Try pushing into a repository with a dirty working tree
1482         # (1) the working tree updated
1483         (
1484                 cd testrepo &&
1485                 echo changed >path1
1486         ) &&
1487         test_must_fail git push testrepo master &&
1488         (
1489                 cd testrepo &&
1490                 test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
1491                 git diff --quiet --cached &&
1492                 test changed = "$(cat path1)"
1493         ) &&
1494
1495         # (2) the index updated
1496         (
1497                 cd testrepo &&
1498                 echo changed >path1 &&
1499                 git add path1
1500         ) &&
1501         test_must_fail git push testrepo master &&
1502         (
1503                 cd testrepo &&
1504                 test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
1505                 git diff --quiet &&
1506                 test changed = "$(cat path1)"
1507         ) &&
1508
1509         # Introduce a new file in the update
1510         test_commit fifth path3 &&
1511
1512         # (3) the working tree has an untracked file that would interfere
1513         (
1514                 cd testrepo &&
1515                 git reset --hard &&
1516                 echo changed >path3
1517         ) &&
1518         test_must_fail git push testrepo master &&
1519         (
1520                 cd testrepo &&
1521                 test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) &&
1522                 git diff --quiet &&
1523                 git diff --quiet --cached &&
1524                 test changed = "$(cat path3)"
1525         ) &&
1526
1527         # (4) the target changes to what gets pushed but it still is a change
1528         (
1529                 cd testrepo &&
1530                 git reset --hard &&
1531                 echo fifth >path3 &&
1532                 git add path3
1533         ) &&
1534         test_must_fail git push testrepo master &&
1535         (
1536                 cd testrepo &&
1537                 test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) &&
1538                 git diff --quiet &&
1539                 test fifth = "$(cat path3)"
1540         ) &&
1541
1542         # (5) push into void
1543         rm -fr void &&
1544         git init void &&
1545         (
1546                 cd void &&
1547                 git config receive.denyCurrentBranch updateInstead
1548         ) &&
1549         git push void master &&
1550         (
1551                 cd void &&
1552                 test $(git -C .. rev-parse master) = $(git rev-parse HEAD) &&
1553                 git diff --quiet &&
1554                 git diff --cached --quiet
1555         )
1556 '
1557
1558 test_expect_success 'updateInstead with push-to-checkout hook' '
1559         rm -fr testrepo &&
1560         git init testrepo &&
1561         (
1562                 cd testrepo &&
1563                 git pull .. master &&
1564                 git reset --hard HEAD^^ &&
1565                 git tag initial &&
1566                 git config receive.denyCurrentBranch updateInstead &&
1567                 write_script .git/hooks/push-to-checkout <<-\EOF
1568                 echo >&2 updating from $(git rev-parse HEAD)
1569                 echo >&2 updating to "$1"
1570
1571                 git update-index -q --refresh &&
1572                 git read-tree -u -m HEAD "$1" || {
1573                         status=$?
1574                         echo >&2 read-tree failed
1575                         exit $status
1576                 }
1577                 EOF
1578         ) &&
1579
1580         # Try pushing into a pristine
1581         git push testrepo master &&
1582         (
1583                 cd testrepo &&
1584                 git diff --quiet &&
1585                 git diff HEAD --quiet &&
1586                 test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
1587         ) &&
1588
1589         # Try pushing into a repository with conflicting change
1590         (
1591                 cd testrepo &&
1592                 git reset --hard initial &&
1593                 echo conflicting >path2
1594         ) &&
1595         test_must_fail git push testrepo master &&
1596         (
1597                 cd testrepo &&
1598                 test $(git rev-parse initial) = $(git rev-parse HEAD) &&
1599                 test conflicting = "$(cat path2)" &&
1600                 git diff-index --quiet --cached HEAD
1601         ) &&
1602
1603         # Try pushing into a repository with unrelated change
1604         (
1605                 cd testrepo &&
1606                 git reset --hard initial &&
1607                 echo unrelated >path1 &&
1608                 echo irrelevant >path5 &&
1609                 git add path5
1610         ) &&
1611         git push testrepo master &&
1612         (
1613                 cd testrepo &&
1614                 test "$(cat path1)" = unrelated &&
1615                 test "$(cat path5)" = irrelevant &&
1616                 test "$(git diff --name-only --cached HEAD)" = path5 &&
1617                 test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
1618         ) &&
1619
1620         # push into void
1621         rm -fr void &&
1622         git init void &&
1623         (
1624                 cd void &&
1625                 git config receive.denyCurrentBranch updateInstead &&
1626                 write_script .git/hooks/push-to-checkout <<-\EOF
1627                 if git rev-parse --quiet --verify HEAD
1628                 then
1629                         has_head=yes
1630                         echo >&2 updating from $(git rev-parse HEAD)
1631                 else
1632                         has_head=no
1633                         echo >&2 pushing into void
1634                 fi
1635                 echo >&2 updating to "$1"
1636
1637                 git update-index -q --refresh &&
1638                 case "$has_head" in
1639                 yes)
1640                         git read-tree -u -m HEAD "$1" ;;
1641                 no)
1642                         git read-tree -u -m "$1" ;;
1643                 esac || {
1644                         status=$?
1645                         echo >&2 read-tree failed
1646                         exit $status
1647                 }
1648                 EOF
1649         ) &&
1650
1651         git push void master &&
1652         (
1653                 cd void &&
1654                 git diff --quiet &&
1655                 git diff --cached --quiet &&
1656                 test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
1657         )
1658 '
1659
1660 test_done