fetch: do not pass ref-prefixes for fetch by exact SHA1
[git/git.git] / t / t5516-fetch-push.sh
CommitLineData
bcdb34f7
JH
1#!/bin/sh
2
2ead7a67
RR
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
72549dfd 14* reflogs
2ead7a67 15'
bcdb34f7
JH
16
17. ./test-lib.sh
18
bf45242b 19D=$(pwd)
bcdb34f7
JH
20
21mk_empty () {
2e433b78
JK
22 repo_name="$1"
23 rm -fr "$repo_name" &&
24 mkdir "$repo_name" &&
bcdb34f7 25 (
2e433b78 26 cd "$repo_name" &&
586e4ce2 27 git init &&
acd2a45b 28 git config receive.denyCurrentBranch warn &&
586e4ce2 29 mv .git/hooks .git/hooks-disabled
bcdb34f7
JH
30 )
31}
32
6125796f 33mk_test () {
2e433b78
JK
34 repo_name="$1"
35 shift
36
37 mk_empty "$repo_name" &&
6125796f
JH
38 (
39 for ref in "$@"
40 do
2e433b78 41 git push "$repo_name" $the_first_commit:refs/$ref ||
5bd81c73 42 exit
6125796f 43 done &&
2e433b78 44 cd "$repo_name" &&
6125796f
JH
45 for ref in "$@"
46 do
848575d8
JN
47 echo "$the_first_commit" >expect &&
48 git show-ref -s --verify refs/$ref >actual &&
49 test_cmp expect actual ||
50 exit
6125796f
JH
51 done &&
52 git fsck --full
53 )
54}
55
160b81ed 56mk_test_with_hooks() {
2e433b78 57 repo_name=$1
160b81ed
PYH
58 mk_test "$@" &&
59 (
2e433b78 60 cd "$repo_name" &&
160b81ed
PYH
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
b2dc968e 91mk_child() {
2e433b78
JK
92 rm -rf "$2" &&
93 git clone "$1" "$2"
b2dc968e
JK
94}
95
6125796f 96check_push_result () {
2e433b78
JK
97 repo_name="$1"
98 shift
99
6125796f 100 (
2e433b78 101 cd "$repo_name" &&
848575d8
JN
102 echo "$1" >expect &&
103 shift &&
6125796f
JH
104 for ref in "$@"
105 do
848575d8
JN
106 git show-ref -s --verify refs/$ref >actual &&
107 test_cmp expect actual ||
108 exit
6125796f
JH
109 done &&
110 git fsck --full
111 )
112}
113
bcdb34f7
JH
114test_expect_success setup '
115
d4785cd1 116 >path1 &&
bcdb34f7
JH
117 git add path1 &&
118 test_tick &&
119 git commit -a -m repo &&
6125796f
JH
120 the_first_commit=$(git show-ref -s --verify refs/heads/master) &&
121
d4785cd1 122 >path2 &&
6125796f
JH
123 git add path2 &&
124 test_tick &&
125 git commit -a -m second &&
bcdb34f7
JH
126 the_commit=$(git show-ref -s --verify refs/heads/master)
127
128'
129
130test_expect_success 'fetch without wildcard' '
2e433b78 131 mk_empty testrepo &&
bcdb34f7
JH
132 (
133 cd testrepo &&
134 git fetch .. refs/heads/master:refs/remotes/origin/master &&
135
848575d8
JN
136 echo "$the_commit commit refs/remotes/origin/master" >expect &&
137 git for-each-ref refs/remotes/origin >actual &&
138 test_cmp expect actual
bcdb34f7
JH
139 )
140'
141
142test_expect_success 'fetch with wildcard' '
2e433b78 143 mk_empty testrepo &&
bcdb34f7
JH
144 (
145 cd testrepo &&
146 git config remote.up.url .. &&
147 git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
148 git fetch up &&
149
848575d8
JN
150 echo "$the_commit commit refs/remotes/origin/master" >expect &&
151 git for-each-ref refs/remotes/origin >actual &&
152 test_cmp expect actual
bcdb34f7
JH
153 )
154'
155
55029ae4 156test_expect_success 'fetch with insteadOf' '
2e433b78 157 mk_empty testrepo &&
55029ae4 158 (
60e3aba9 159 TRASH=$(pwd)/ &&
55029ae4 160 cd testrepo &&
f69e836f 161 git config "url.$TRASH.insteadOf" trash/ &&
55029ae4
DB
162 git config remote.up.url trash/. &&
163 git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
164 git fetch up &&
165
848575d8
JN
166 echo "$the_commit commit refs/remotes/origin/master" >expect &&
167 git for-each-ref refs/remotes/origin >actual &&
168 test_cmp expect actual
55029ae4
DB
169 )
170'
171
1c2eafb8 172test_expect_success 'fetch with pushInsteadOf (should not rewrite)' '
2e433b78 173 mk_empty testrepo &&
1c2eafb8
JT
174 (
175 TRASH=$(pwd)/ &&
176 cd testrepo &&
177 git config "url.trash/.pushInsteadOf" "$TRASH" &&
178 git config remote.up.url "$TRASH." &&
179 git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
180 git fetch up &&
181
848575d8
JN
182 echo "$the_commit commit refs/remotes/origin/master" >expect &&
183 git for-each-ref refs/remotes/origin >actual &&
184 test_cmp expect actual
1c2eafb8
JT
185 )
186'
187
bcdb34f7 188test_expect_success 'push without wildcard' '
2e433b78 189 mk_empty testrepo &&
bcdb34f7
JH
190
191 git push testrepo refs/heads/master:refs/remotes/origin/master &&
192 (
193 cd testrepo &&
848575d8
JN
194 echo "$the_commit commit refs/remotes/origin/master" >expect &&
195 git for-each-ref refs/remotes/origin >actual &&
196 test_cmp expect actual
bcdb34f7
JH
197 )
198'
199
200test_expect_success 'push with wildcard' '
2e433b78 201 mk_empty testrepo &&
bcdb34f7
JH
202
203 git push testrepo "refs/heads/*:refs/remotes/origin/*" &&
204 (
205 cd testrepo &&
848575d8
JN
206 echo "$the_commit commit refs/remotes/origin/master" >expect &&
207 git for-each-ref refs/remotes/origin >actual &&
208 test_cmp expect actual
bcdb34f7
JH
209 )
210'
211
55029ae4 212test_expect_success 'push with insteadOf' '
2e433b78 213 mk_empty testrepo &&
f69e836f 214 TRASH="$(pwd)/" &&
3c695523 215 test_config "url.$TRASH.insteadOf" trash/ &&
55029ae4
DB
216 git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
217 (
218 cd testrepo &&
848575d8
JN
219 echo "$the_commit commit refs/remotes/origin/master" >expect &&
220 git for-each-ref refs/remotes/origin >actual &&
221 test_cmp expect actual
55029ae4
DB
222 )
223'
224
1c2eafb8 225test_expect_success 'push with pushInsteadOf' '
2e433b78 226 mk_empty testrepo &&
1c2eafb8 227 TRASH="$(pwd)/" &&
3c695523 228 test_config "url.$TRASH.pushInsteadOf" trash/ &&
1c2eafb8
JT
229 git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
230 (
231 cd testrepo &&
848575d8
JN
232 echo "$the_commit commit refs/remotes/origin/master" >expect &&
233 git for-each-ref refs/remotes/origin >actual &&
234 test_cmp expect actual
1c2eafb8
JT
235 )
236'
237
238test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' '
2e433b78 239 mk_empty testrepo &&
41ae34d1 240 test_config "url.trash2/.pushInsteadOf" testrepo/ &&
eb32c66e 241 test_config "url.trash3/.pushInsteadOf" trash/wrong &&
3c695523 242 test_config remote.r.url trash/wrong &&
41ae34d1 243 test_config remote.r.pushurl "testrepo/" &&
1c2eafb8
JT
244 git push r refs/heads/master:refs/remotes/origin/master &&
245 (
246 cd testrepo &&
848575d8
JN
247 echo "$the_commit commit refs/remotes/origin/master" >expect &&
248 git for-each-ref refs/remotes/origin >actual &&
249 test_cmp expect actual
1c2eafb8
JT
250 )
251'
252
6125796f
JH
253test_expect_success 'push with matching heads' '
254
2e433b78 255 mk_test testrepo heads/master &&
0a42ac03 256 git push testrepo : &&
2e433b78 257 check_push_result testrepo $the_commit heads/master
6125796f
JH
258
259'
260
a83619d6
PB
261test_expect_success 'push with matching heads on the command line' '
262
2e433b78 263 mk_test testrepo heads/master &&
a83619d6 264 git push testrepo : &&
2e433b78 265 check_push_result testrepo $the_commit heads/master
a83619d6
PB
266
267'
268
269test_expect_success 'failed (non-fast-forward) push with matching heads' '
270
2e433b78 271 mk_test testrepo heads/master &&
a83619d6
PB
272 git push testrepo : &&
273 git commit --amend -massaged &&
d492b31c 274 test_must_fail git push testrepo &&
2e433b78 275 check_push_result testrepo $the_commit heads/master &&
a83619d6
PB
276 git reset --hard $the_commit
277
278'
279
280test_expect_success 'push --force with matching heads' '
281
2e433b78 282 mk_test testrepo heads/master &&
a83619d6
PB
283 git push testrepo : &&
284 git commit --amend -massaged &&
0a42ac03 285 git push --force testrepo : &&
2e433b78 286 ! check_push_result testrepo $the_commit heads/master &&
a83619d6
PB
287 git reset --hard $the_commit
288
289'
290
291test_expect_success 'push with matching heads and forced update' '
292
2e433b78 293 mk_test testrepo heads/master &&
a83619d6
PB
294 git push testrepo : &&
295 git commit --amend -massaged &&
296 git push testrepo +: &&
2e433b78 297 ! check_push_result testrepo $the_commit heads/master &&
a83619d6
PB
298 git reset --hard $the_commit
299
300'
301
6125796f
JH
302test_expect_success 'push with no ambiguity (1)' '
303
2e433b78 304 mk_test testrepo heads/master &&
6125796f 305 git push testrepo master:master &&
2e433b78 306 check_push_result testrepo $the_commit heads/master
6125796f
JH
307
308'
309
310test_expect_success 'push with no ambiguity (2)' '
311
2e433b78 312 mk_test testrepo remotes/origin/master &&
ae36bdcf 313 git push testrepo master:origin/master &&
2e433b78 314 check_push_result testrepo $the_commit remotes/origin/master
6125796f
JH
315
316'
317
ae36bdcf
SP
318test_expect_success 'push with colon-less refspec, no ambiguity' '
319
2e433b78 320 mk_test testrepo heads/master heads/t/master &&
ae36bdcf
SP
321 git branch -f t/master master &&
322 git push testrepo master &&
2e433b78
JK
323 check_push_result testrepo $the_commit heads/master &&
324 check_push_result testrepo $the_first_commit heads/t/master
ae36bdcf
SP
325
326'
327
6125796f
JH
328test_expect_success 'push with weak ambiguity (1)' '
329
2e433b78 330 mk_test testrepo heads/master remotes/origin/master &&
6125796f 331 git push testrepo master:master &&
2e433b78
JK
332 check_push_result testrepo $the_commit heads/master &&
333 check_push_result testrepo $the_first_commit remotes/origin/master
6125796f
JH
334
335'
336
337test_expect_success 'push with weak ambiguity (2)' '
338
2e433b78 339 mk_test testrepo heads/master remotes/origin/master remotes/another/master &&
6125796f 340 git push testrepo master:master &&
2e433b78
JK
341 check_push_result testrepo $the_commit heads/master &&
342 check_push_result testrepo $the_first_commit remotes/origin/master remotes/another/master
6125796f
JH
343
344'
345
3ef6a1fe 346test_expect_success 'push with ambiguity' '
6125796f 347
2e433b78 348 mk_test testrepo heads/frotz tags/frotz &&
5bd81c73 349 test_must_fail git push testrepo master:frotz &&
2e433b78 350 check_push_result testrepo $the_first_commit heads/frotz tags/frotz
1ed10b88
JH
351
352'
353
354test_expect_success 'push with colon-less refspec (1)' '
355
2e433b78 356 mk_test testrepo heads/frotz tags/frotz &&
1ed10b88
JH
357 git branch -f frotz master &&
358 git push testrepo frotz &&
2e433b78
JK
359 check_push_result testrepo $the_commit heads/frotz &&
360 check_push_result testrepo $the_first_commit tags/frotz
1ed10b88
JH
361
362'
363
364test_expect_success 'push with colon-less refspec (2)' '
365
2e433b78 366 mk_test testrepo heads/frotz tags/frotz &&
1ed10b88
JH
367 if git show-ref --verify -q refs/heads/frotz
368 then
369 git branch -D frotz
370 fi &&
371 git tag -f frotz &&
dbfeddb1 372 git push -f testrepo frotz &&
2e433b78
JK
373 check_push_result testrepo $the_commit tags/frotz &&
374 check_push_result testrepo $the_first_commit heads/frotz
1ed10b88
JH
375
376'
377
378test_expect_success 'push with colon-less refspec (3)' '
379
2e433b78 380 mk_test testrepo &&
1ed10b88
JH
381 if git show-ref --verify -q refs/tags/frotz
382 then
383 git tag -d frotz
384 fi &&
385 git branch -f frotz master &&
386 git push testrepo frotz &&
2e433b78 387 check_push_result testrepo $the_commit heads/frotz &&
9a3c6f7b 388 test 1 = $( cd testrepo && git show-ref | wc -l )
1ed10b88
JH
389'
390
391test_expect_success 'push with colon-less refspec (4)' '
392
2e433b78 393 mk_test testrepo &&
1ed10b88
JH
394 if git show-ref --verify -q refs/heads/frotz
395 then
396 git branch -D frotz
397 fi &&
398 git tag -f frotz &&
399 git push testrepo frotz &&
2e433b78 400 check_push_result testrepo $the_commit tags/frotz &&
9a3c6f7b 401 test 1 = $( cd testrepo && git show-ref | wc -l )
1ed10b88 402
6125796f
JH
403'
404
7be8b3ba 405test_expect_success 'push head with non-existent, incomplete dest' '
f8aae120 406
2e433b78 407 mk_test testrepo &&
f8aae120 408 git push testrepo master:branch &&
2e433b78 409 check_push_result testrepo $the_commit heads/branch
f8aae120
JK
410
411'
412
7be8b3ba 413test_expect_success 'push tag with non-existent, incomplete dest' '
f8aae120 414
2e433b78 415 mk_test testrepo &&
f8aae120
JK
416 git tag -f v1.0 &&
417 git push testrepo v1.0:tag &&
2e433b78 418 check_push_result testrepo $the_commit tags/tag
f8aae120
JK
419
420'
421
7be8b3ba 422test_expect_success 'push sha1 with non-existent, incomplete dest' '
f8aae120 423
2e433b78 424 mk_test testrepo &&
bf45242b 425 test_must_fail git push testrepo $(git rev-parse master):foo
f8aae120
JK
426
427'
428
7be8b3ba 429test_expect_success 'push ref expression with non-existent, incomplete dest' '
f8aae120 430
2e433b78 431 mk_test testrepo &&
f8aae120
JK
432 test_must_fail git push testrepo master^:branch
433
434'
435
47d996a2
SP
436test_expect_success 'push with HEAD' '
437
2e433b78 438 mk_test testrepo heads/master &&
47d996a2
SP
439 git checkout master &&
440 git push testrepo HEAD &&
2e433b78 441 check_push_result testrepo $the_commit heads/master
47d996a2
SP
442
443'
444
445test_expect_success 'push with HEAD nonexisting at remote' '
446
2e433b78 447 mk_test testrepo heads/master &&
47d996a2
SP
448 git checkout -b local master &&
449 git push testrepo HEAD &&
2e433b78 450 check_push_result testrepo $the_commit heads/local
47d996a2
SP
451'
452
9f0ea7e8
DB
453test_expect_success 'push with +HEAD' '
454
2e433b78 455 mk_test testrepo heads/master &&
9f0ea7e8
DB
456 git checkout master &&
457 git branch -D local &&
458 git checkout -b local &&
459 git push testrepo master local &&
2e433b78
JK
460 check_push_result testrepo $the_commit heads/master &&
461 check_push_result testrepo $the_commit heads/local &&
9f0ea7e8
DB
462
463 # Without force rewinding should fail
464 git reset --hard HEAD^ &&
d492b31c 465 test_must_fail git push testrepo HEAD &&
2e433b78 466 check_push_result testrepo $the_commit heads/local &&
9f0ea7e8
DB
467
468 # With force rewinding should succeed
469 git push testrepo +HEAD &&
2e433b78 470 check_push_result testrepo $the_first_commit heads/local
9f0ea7e8
DB
471
472'
473
7be8b3ba 474test_expect_success 'push HEAD with non-existent, incomplete dest' '
f8aae120 475
2e433b78 476 mk_test testrepo &&
f8aae120
JK
477 git checkout master &&
478 git push testrepo HEAD:branch &&
2e433b78 479 check_push_result testrepo $the_commit heads/branch
f8aae120
JK
480
481'
482
9f0ea7e8
DB
483test_expect_success 'push with config remote.*.push = HEAD' '
484
2e433b78 485 mk_test testrepo heads/local &&
9f0ea7e8
DB
486 git checkout master &&
487 git branch -f local $the_commit &&
488 (
489 cd testrepo &&
490 git checkout local &&
491 git reset --hard $the_first_commit
492 ) &&
3c695523
JN
493 test_config remote.there.url testrepo &&
494 test_config remote.there.push HEAD &&
495 test_config branch.master.remote there &&
9f0ea7e8 496 git push &&
2e433b78
JK
497 check_push_result testrepo $the_commit heads/master &&
498 check_push_result testrepo $the_first_commit heads/local
9f0ea7e8
DB
499'
500
224c2171
RR
501test_expect_success 'push with remote.pushdefault' '
502 mk_test up_repo heads/master &&
503 mk_test down_repo heads/master &&
504 test_config remote.up.url up_repo &&
505 test_config remote.down.url down_repo &&
506 test_config branch.master.remote up &&
507 test_config remote.pushdefault down &&
54a3c673 508 test_config push.default matching &&
224c2171
RR
509 git push &&
510 check_push_result up_repo $the_first_commit heads/master &&
511 check_push_result down_repo $the_commit heads/master
9f0ea7e8
DB
512'
513
e1ca4241
MG
514test_expect_success 'push with config remote.*.pushurl' '
515
2e433b78 516 mk_test testrepo heads/master &&
e1ca4241 517 git checkout master &&
3c695523
JN
518 test_config remote.there.url test2repo &&
519 test_config remote.there.pushurl testrepo &&
0a42ac03 520 git push there : &&
2e433b78 521 check_push_result testrepo $the_commit heads/master
e1ca4241
MG
522'
523
9f765ce6
RR
524test_expect_success 'push with config branch.*.pushremote' '
525 mk_test up_repo heads/master &&
526 mk_test side_repo heads/master &&
527 mk_test down_repo heads/master &&
528 test_config remote.up.url up_repo &&
529 test_config remote.pushdefault side_repo &&
530 test_config remote.down.url down_repo &&
531 test_config branch.master.remote up &&
532 test_config branch.master.pushremote down &&
54a3c673 533 test_config push.default matching &&
9f765ce6
RR
534 git push &&
535 check_push_result up_repo $the_first_commit heads/master &&
536 check_push_result side_repo $the_first_commit heads/master &&
537 check_push_result down_repo $the_commit heads/master
e1ca4241
MG
538'
539
98b406f3
JK
540test_expect_success 'branch.*.pushremote config order is irrelevant' '
541 mk_test one_repo heads/master &&
542 mk_test two_repo heads/master &&
543 test_config remote.one.url one_repo &&
544 test_config remote.two.url two_repo &&
545 test_config branch.master.pushremote two_repo &&
546 test_config remote.pushdefault one_repo &&
547 test_config push.default matching &&
548 git push &&
549 check_push_result one_repo $the_first_commit heads/master &&
550 check_push_result two_repo $the_commit heads/master
551'
552
11f2441f
BE
553test_expect_success 'push with dry-run' '
554
2e433b78 555 mk_test testrepo heads/master &&
d4785cd1
JS
556 (
557 cd testrepo &&
558 old_commit=$(git show-ref -s --verify refs/heads/master)
559 ) &&
0a42ac03 560 git push --dry-run testrepo : &&
2e433b78 561 check_push_result testrepo $old_commit heads/master
11f2441f
BE
562'
563
28391a80
JS
564test_expect_success 'push updates local refs' '
565
2e433b78
JK
566 mk_test testrepo heads/master &&
567 mk_child testrepo child &&
d4785cd1
JS
568 (
569 cd child &&
b2dc968e 570 git pull .. master &&
28391a80 571 git push &&
d4785cd1
JS
572 test $(git rev-parse master) = \
573 $(git rev-parse remotes/origin/master)
574 )
28391a80
JS
575
576'
577
16ed2f48
CB
578test_expect_success 'push updates up-to-date local refs' '
579
2e433b78
JK
580 mk_test testrepo heads/master &&
581 mk_child testrepo child1 &&
582 mk_child testrepo child2 &&
b2dc968e 583 (cd child1 && git pull .. master && git push) &&
d4785cd1
JS
584 (
585 cd child2 &&
16ed2f48
CB
586 git pull ../child1 master &&
587 git push &&
d4785cd1
JS
588 test $(git rev-parse master) = \
589 $(git rev-parse remotes/origin/master)
590 )
16ed2f48
CB
591
592'
593
594test_expect_success 'push preserves up-to-date packed refs' '
595
2e433b78
JK
596 mk_test testrepo heads/master &&
597 mk_child testrepo child &&
d4785cd1
JS
598 (
599 cd child &&
16ed2f48 600 git push &&
d4785cd1
JS
601 ! test -f .git/refs/remotes/origin/master
602 )
16ed2f48
CB
603
604'
605
28391a80
JS
606test_expect_success 'push does not update local refs on failure' '
607
2e433b78
JK
608 mk_test testrepo heads/master &&
609 mk_child testrepo child &&
b2dc968e 610 mkdir testrepo/.git/hooks &&
fc012c28 611 echo "#!/no/frobnication/today" >testrepo/.git/hooks/pre-receive &&
b2dc968e 612 chmod +x testrepo/.git/hooks/pre-receive &&
d4785cd1
JS
613 (
614 cd child &&
b2dc968e 615 git pull .. master
d492b31c 616 test_must_fail git push &&
28391a80 617 test $(git rev-parse master) != \
d4785cd1
JS
618 $(git rev-parse remotes/origin/master)
619 )
28391a80
JS
620
621'
622
623test_expect_success 'allow deleting an invalid remote ref' '
624
2e433b78 625 mk_test testrepo heads/master &&
28391a80
JS
626 rm -f testrepo/.git/objects/??/* &&
627 git push testrepo :refs/heads/master &&
d492b31c 628 (cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
28391a80
JS
629
630'
631
160b81ed 632test_expect_success 'pushing valid refs triggers post-receive and post-update hooks' '
2e433b78 633 mk_test_with_hooks testrepo heads/master heads/next &&
160b81ed
PYH
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=$_z40 &&
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' '
2e433b78 669 mk_test_with_hooks testrepo heads/master &&
160b81ed
PYH
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 $_z40 $_z40 refs/heads/master
676 EOF
677
678 cat >update.expect <<-EOF &&
679 refs/heads/master $_z40 $_z40
680 EOF
681
682 cat >post-receive.expect <<-EOF &&
683 $_z40 $_z40 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' '
2e433b78 698 mk_test_with_hooks testrepo heads/master &&
160b81ed
PYH
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 $_z40 $_z40 refs/heads/nonexistent
707 EOF
708
709 cat >update.expect <<-EOF &&
710 refs/heads/master $orgmaster $newmaster
711 refs/heads/nonexistent $_z40 $_z40
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' '
2e433b78 730 mk_test_with_hooks testrepo heads/master &&
160b81ed
PYH
731 git push testrepo :refs/heads/nonexistent &&
732 (
733 cd testrepo/.git &&
734 cat >pre-receive.expect <<-EOF &&
735 $_z40 $_z40 refs/heads/nonexistent
736 EOF
737
738 cat >update.expect <<-EOF &&
739 refs/heads/nonexistent $_z40 $_z40
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' '
2e433b78 750 mk_test_with_hooks testrepo heads/master heads/next heads/pu &&
160b81ed
PYH
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=$_z40 &&
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 $_z40 $_z40 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 $_z40 $_z40
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
f517f1f2 795test_expect_success 'allow deleting a ref using --delete' '
2e433b78 796 mk_test testrepo heads/master &&
f517f1f2
JK
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' '
2e433b78 803 mk_test testrepo heads/master &&
f517f1f2
JK
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' '
2e433b78 812 mk_test testrepo heads/master &&
f517f1f2
JK
813 test_must_fail git push testrepo --delete
814'
815
816test_expect_success 'push --delete refuses src:dest refspecs' '
2e433b78 817 mk_test testrepo heads/master &&
f517f1f2
JK
818 test_must_fail git push testrepo --delete master:foo
819'
820
986e8239 821test_expect_success 'warn on push to HEAD of non-bare repository' '
2e433b78 822 mk_test testrepo heads/master &&
d4785cd1
JS
823 (
824 cd testrepo &&
986e8239 825 git checkout master &&
d4785cd1
JS
826 git config receive.denyCurrentBranch warn
827 ) &&
986e8239 828 git push testrepo master 2>stderr &&
3d95d92b 829 grep "warning: updating the current branch" stderr
986e8239
JK
830'
831
832test_expect_success 'deny push to HEAD of non-bare repository' '
2e433b78 833 mk_test testrepo heads/master &&
d4785cd1
JS
834 (
835 cd testrepo &&
986e8239 836 git checkout master &&
d4785cd1
JS
837 git config receive.denyCurrentBranch true
838 ) &&
986e8239
JK
839 test_must_fail git push testrepo master
840'
841
842test_expect_success 'allow push to HEAD of bare repository (bare)' '
2e433b78 843 mk_test testrepo heads/master &&
d4785cd1
JS
844 (
845 cd testrepo &&
986e8239
JK
846 git checkout master &&
847 git config receive.denyCurrentBranch true &&
d4785cd1
JS
848 git config core.bare true
849 ) &&
986e8239 850 git push testrepo master 2>stderr &&
3d95d92b 851 ! grep "warning: updating the current branch" stderr
986e8239
JK
852'
853
854test_expect_success 'allow push to HEAD of non-bare repository (config)' '
2e433b78 855 mk_test testrepo heads/master &&
d4785cd1
JS
856 (
857 cd testrepo &&
986e8239
JK
858 git checkout master &&
859 git config receive.denyCurrentBranch false
860 ) &&
861 git push testrepo master 2>stderr &&
3d95d92b 862 ! grep "warning: updating the current branch" stderr
986e8239
JK
863'
864
18afe101 865test_expect_success 'fetch with branches' '
2e433b78 866 mk_empty testrepo &&
18afe101
MK
867 git branch second $the_first_commit &&
868 git checkout second &&
869 echo ".." > testrepo/.git/branches/branch1 &&
d4785cd1
JS
870 (
871 cd testrepo &&
18afe101 872 git fetch branch1 &&
848575d8
JN
873 echo "$the_commit commit refs/heads/branch1" >expect &&
874 git for-each-ref refs/heads >actual &&
875 test_cmp expect actual
18afe101
MK
876 ) &&
877 git checkout master
878'
879
880test_expect_success 'fetch with branches containing #' '
2e433b78 881 mk_empty testrepo &&
18afe101 882 echo "..#second" > testrepo/.git/branches/branch2 &&
d4785cd1
JS
883 (
884 cd testrepo &&
18afe101 885 git fetch branch2 &&
848575d8
JN
886 echo "$the_first_commit commit refs/heads/branch2" >expect &&
887 git for-each-ref refs/heads >actual &&
888 test_cmp expect actual
18afe101
MK
889 ) &&
890 git checkout master
891'
892
893test_expect_success 'push with branches' '
2e433b78 894 mk_empty testrepo &&
18afe101
MK
895 git checkout second &&
896 echo "testrepo" > .git/branches/branch1 &&
897 git push branch1 &&
d4785cd1
JS
898 (
899 cd testrepo &&
848575d8
JN
900 echo "$the_first_commit commit refs/heads/master" >expect &&
901 git for-each-ref refs/heads >actual &&
902 test_cmp expect actual
18afe101
MK
903 )
904'
905
906test_expect_success 'push with branches containing #' '
2e433b78 907 mk_empty testrepo &&
18afe101
MK
908 echo "testrepo#branch3" > .git/branches/branch2 &&
909 git push branch2 &&
d4785cd1
JS
910 (
911 cd testrepo &&
848575d8
JN
912 echo "$the_first_commit commit refs/heads/branch3" >expect &&
913 git for-each-ref refs/heads >actual &&
914 test_cmp expect actual
18afe101
MK
915 ) &&
916 git checkout master
917'
918
da3efdb1 919test_expect_success 'push into aliased refs (consistent)' '
2e433b78
JK
920 mk_test testrepo heads/master &&
921 mk_child testrepo child1 &&
922 mk_child testrepo child2 &&
da3efdb1
JS
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)' '
2e433b78
JK
942 mk_test testrepo heads/master &&
943 mk_child testrepo child1 &&
944 mk_child testrepo child2 &&
da3efdb1
JS
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
dbfeddb1 968test_expect_success 'push requires --force to update lightweight tag' '
2e433b78
JK
969 mk_test testrepo heads/master &&
970 mk_child testrepo child1 &&
971 mk_child testrepo child2 &&
dbfeddb1
CR
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
fbe4f447 989test_expect_success 'push --porcelain' '
2e433b78 990 mk_empty testrepo &&
fbe4f447
LA
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 &&
848575d8
JN
997 echo "$the_commit commit refs/remotes/origin/master" >expect &&
998 git for-each-ref refs/remotes/origin >actual &&
999 test_cmp expect actual
fbe4f447 1000 ) &&
c296134d 1001 test_cmp .git/foo .git/bar
fbe4f447
LA
1002'
1003
1004test_expect_success 'push --porcelain bad url' '
2e433b78 1005 mk_empty testrepo &&
fbe4f447 1006 test_must_fail git push >.git/bar --porcelain asdfasdfasd refs/heads/master:refs/remotes/origin/master &&
c7cf9566 1007 ! grep -q Done .git/bar
fbe4f447
LA
1008'
1009
1010test_expect_success 'push --porcelain rejected' '
2e433b78 1011 mk_empty testrepo &&
fbe4f447
LA
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 &&
c296134d 1021 test_cmp .git/foo .git/bar
fbe4f447
LA
1022'
1023
1024test_expect_success 'push --porcelain --dry-run rejected' '
2e433b78 1025 mk_empty testrepo &&
fbe4f447
LA
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 &&
c296134d 1036 test_cmp .git/foo .git/bar
fbe4f447
LA
1037'
1038
6ddba5e2 1039test_expect_success 'push --prune' '
2e433b78 1040 mk_test testrepo heads/master heads/second heads/foo heads/bar &&
0a42ac03 1041 git push --prune testrepo : &&
2e433b78
JK
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
6ddba5e2
FC
1045'
1046
1047test_expect_success 'push --prune refspec' '
2e433b78 1048 mk_test testrepo tmp/master tmp/second tmp/foo tmp/bar &&
6ddba5e2 1049 git push --prune testrepo "refs/heads/*:refs/tmp/*" &&
2e433b78
JK
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
6ddba5e2
FC
1053'
1054
daebaa78
JH
1055for configsection in transfer receive
1056do
1057 test_expect_success "push to update a ref hidden by $configsection.hiderefs" '
2e433b78 1058 mk_test testrepo heads/master hidden/one hidden/two hidden/three &&
daebaa78
JH
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 &&
2e433b78 1066 check_push_result testrepo $the_commit heads/master &&
daebaa78
JH
1067
1068 # push to update a hidden ref should fail
1069 test_must_fail git push testrepo master:refs/hidden/one &&
2e433b78 1070 check_push_result testrepo $the_first_commit hidden/one &&
daebaa78
JH
1071
1072 # push to delete a hidden ref should fail
1073 test_must_fail git push testrepo :refs/hidden/two &&
2e433b78 1074 check_push_result testrepo $the_first_commit hidden/two &&
daebaa78
JH
1075
1076 # idempotent push to update a hidden ref should fail
1077 test_must_fail git push testrepo $the_first_commit:refs/hidden/three &&
2e433b78 1078 check_push_result testrepo $the_first_commit hidden/three
daebaa78
JH
1079 '
1080done
1081
6e7b66ee 1082test_expect_success 'fetch exact SHA1' '
2e433b78 1083 mk_test testrepo heads/master hidden/one &&
6e7b66ee
JH
1084 git push testrepo master:refs/hidden/one &&
1085 (
1086 cd testrepo &&
1087 git config transfer.hiderefs refs/hidden
1088 ) &&
2e433b78 1089 check_push_result testrepo $the_commit hidden/one &&
6e7b66ee 1090
2e433b78 1091 mk_child testrepo child &&
6e7b66ee
JH
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
e70a65c5 1101 test_must_fail git fetch -v ../testrepo $the_commit:refs/heads/copy 2>err &&
d56583de 1102 test_i18ngrep "Server does not allow request for unadvertised object" err &&
6e7b66ee
JH
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
c3c17bf1
JK
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
6e7b66ee
JH
1121 )
1122'
1123
6c301adb
JN
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
68ee6289
FM
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 &&
8bf4becf
LS
1185 test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_3 &&
1186 test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_1 &&
68ee6289
FM
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 &&
8bf4becf 1193 test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_3
68ee6289
FM
1194 )
1195 '
1196done
1197
c2aba155 1198test_expect_success 'fetch follows tags by default' '
2e433b78 1199 mk_test testrepo heads/master &&
c2aba155
JH
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
ca02465b
JH
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 &&
fc9261ca 1259 git config push.default matching &&
ca02465b
JH
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
fc9261ca
JH
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
c2aba155 1300test_expect_success 'push does not follow tags by default' '
2e433b78 1301 mk_test testrepo heads/master &&
c2aba155
JH
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' '
2e433b78 1324 mk_test testrepo heads/master &&
c2aba155
JH
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
f7c815c3
NTND
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
458a7e50
JK
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
72549dfd
JK
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
1404bcbb
JS
1415test_expect_success 'receive.denyCurrentBranch = updateInstead' '
1416 git push testrepo master &&
4d7a5cea
JH
1417 (
1418 cd testrepo &&
1404bcbb
JS
1419 git reset --hard &&
1420 git config receive.denyCurrentBranch updateInstead
1421 ) &&
1422 test_commit third path2 &&
4d7a5cea
JH
1423
1424 # Try pushing into a repository with pristine working tree
1404bcbb 1425 git push testrepo master &&
4d7a5cea
JH
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) &&
0e496492 1440 test-tool chmtime +100 path1
4d7a5cea
JH
1441 ) &&
1442 git push testrepo master &&
1443 (
1444 cd testrepo &&
1404bcbb
JS
1445 git update-index -q --refresh &&
1446 git diff-files --quiet -- &&
1447 git diff-index --quiet --cached HEAD -- &&
4d7a5cea
JH
1448 test_cmp ../path1 path1 &&
1449 test third = "$(cat path2)" &&
1450 test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
1404bcbb 1451 ) &&
4d7a5cea
JH
1452
1453 # Update what is to be pushed
1404bcbb 1454 test_commit fourth path2 &&
4d7a5cea
JH
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 ) &&
1404bcbb 1462 test_must_fail git push testrepo master &&
4d7a5cea
JH
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) &&
1404bcbb 1513 git diff --quiet &&
4d7a5cea 1514 test fifth = "$(cat path3)"
1a51b524 1515 ) &&
4d7a5cea 1516
1a51b524
JH
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 )
1404bcbb
JS
1531'
1532
08553319
JH
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)
1a51b524
JH
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)
08553319
JH
1632 )
1633'
1634
bcdb34f7 1635test_done