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