t / t5516-fetch-push.shon commit revision.c: treat A...B merge bases as if manually specified (a765499)
   1#!/bin/sh
   2
   3test_description='Basic fetch/push functionality.
   4
   5This test checks the following functionality:
   6
   7* command-line syntax
   8* refspecs
   9* fast-forward detection, and overriding it
  10* configuration
  11* hooks
  12* --porcelain output format
  13* hiderefs
  14'
  15
  16. ./test-lib.sh
  17
  18D=`pwd`
  19
  20mk_empty () {
  21        repo_name="$1"
  22        rm -fr "$repo_name" &&
  23        mkdir "$repo_name" &&
  24        (
  25                cd "$repo_name" &&
  26                git init &&
  27                git config receive.denyCurrentBranch warn &&
  28                mv .git/hooks .git/hooks-disabled
  29        )
  30}
  31
  32mk_test () {
  33        repo_name="$1"
  34        shift
  35
  36        mk_empty "$repo_name" &&
  37        (
  38                for ref in "$@"
  39                do
  40                        git push "$repo_name" $the_first_commit:refs/$ref ||
  41                        exit
  42                done &&
  43                cd "$repo_name" &&
  44                for ref in "$@"
  45                do
  46                        echo "$the_first_commit" >expect &&
  47                        git show-ref -s --verify refs/$ref >actual &&
  48                        test_cmp expect actual ||
  49                        exit
  50                done &&
  51                git fsck --full
  52        )
  53}
  54
  55mk_test_with_hooks() {
  56        repo_name=$1
  57        mk_test "$@" &&
  58        (
  59                cd "$repo_name" &&
  60                mkdir .git/hooks &&
  61                cd .git/hooks &&
  62
  63                cat >pre-receive <<-'EOF' &&
  64                #!/bin/sh
  65                cat - >>pre-receive.actual
  66                EOF
  67
  68                cat >update <<-'EOF' &&
  69                #!/bin/sh
  70                printf "%s %s %s\n" "$@" >>update.actual
  71                EOF
  72
  73                cat >post-receive <<-'EOF' &&
  74                #!/bin/sh
  75                cat - >>post-receive.actual
  76                EOF
  77
  78                cat >post-update <<-'EOF' &&
  79                #!/bin/sh
  80                for ref in "$@"
  81                do
  82                        printf "%s\n" "$ref" >>post-update.actual
  83                done
  84                EOF
  85
  86                chmod +x pre-receive update post-receive post-update
  87        )
  88}
  89
  90mk_child() {
  91        rm -rf "$2" &&
  92        git clone "$1" "$2"
  93}
  94
  95check_push_result () {
  96        repo_name="$1"
  97        shift
  98
  99        (
 100                cd "$repo_name" &&
 101                echo "$1" >expect &&
 102                shift &&
 103                for ref in "$@"
 104                do
 105                        git show-ref -s --verify refs/$ref >actual &&
 106                        test_cmp expect actual ||
 107                        exit
 108                done &&
 109                git fsck --full
 110        )
 111}
 112
 113test_expect_success setup '
 114
 115        >path1 &&
 116        git add path1 &&
 117        test_tick &&
 118        git commit -a -m repo &&
 119        the_first_commit=$(git show-ref -s --verify refs/heads/master) &&
 120
 121        >path2 &&
 122        git add path2 &&
 123        test_tick &&
 124        git commit -a -m second &&
 125        the_commit=$(git show-ref -s --verify refs/heads/master)
 126
 127'
 128
 129test_expect_success 'fetch without wildcard' '
 130        mk_empty testrepo &&
 131        (
 132                cd testrepo &&
 133                git fetch .. refs/heads/master:refs/remotes/origin/master &&
 134
 135                echo "$the_commit commit        refs/remotes/origin/master" >expect &&
 136                git for-each-ref refs/remotes/origin >actual &&
 137                test_cmp expect actual
 138        )
 139'
 140
 141test_expect_success 'fetch with wildcard' '
 142        mk_empty testrepo &&
 143        (
 144                cd testrepo &&
 145                git config remote.up.url .. &&
 146                git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
 147                git fetch up &&
 148
 149                echo "$the_commit commit        refs/remotes/origin/master" >expect &&
 150                git for-each-ref refs/remotes/origin >actual &&
 151                test_cmp expect actual
 152        )
 153'
 154
 155test_expect_success 'fetch with insteadOf' '
 156        mk_empty testrepo &&
 157        (
 158                TRASH=$(pwd)/ &&
 159                cd testrepo &&
 160                git config "url.$TRASH.insteadOf" trash/ &&
 161                git config remote.up.url trash/. &&
 162                git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
 163                git fetch up &&
 164
 165                echo "$the_commit commit        refs/remotes/origin/master" >expect &&
 166                git for-each-ref refs/remotes/origin >actual &&
 167                test_cmp expect actual
 168        )
 169'
 170
 171test_expect_success 'fetch with pushInsteadOf (should not rewrite)' '
 172        mk_empty testrepo &&
 173        (
 174                TRASH=$(pwd)/ &&
 175                cd testrepo &&
 176                git config "url.trash/.pushInsteadOf" "$TRASH" &&
 177                git config remote.up.url "$TRASH." &&
 178                git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
 179                git fetch up &&
 180
 181                echo "$the_commit commit        refs/remotes/origin/master" >expect &&
 182                git for-each-ref refs/remotes/origin >actual &&
 183                test_cmp expect actual
 184        )
 185'
 186
 187test_expect_success 'push without wildcard' '
 188        mk_empty testrepo &&
 189
 190        git push testrepo refs/heads/master:refs/remotes/origin/master &&
 191        (
 192                cd testrepo &&
 193                echo "$the_commit commit        refs/remotes/origin/master" >expect &&
 194                git for-each-ref refs/remotes/origin >actual &&
 195                test_cmp expect actual
 196        )
 197'
 198
 199test_expect_success 'push with wildcard' '
 200        mk_empty testrepo &&
 201
 202        git push testrepo "refs/heads/*:refs/remotes/origin/*" &&
 203        (
 204                cd testrepo &&
 205                echo "$the_commit commit        refs/remotes/origin/master" >expect &&
 206                git for-each-ref refs/remotes/origin >actual &&
 207                test_cmp expect actual
 208        )
 209'
 210
 211test_expect_success 'push with insteadOf' '
 212        mk_empty testrepo &&
 213        TRASH="$(pwd)/" &&
 214        test_config "url.$TRASH.insteadOf" trash/ &&
 215        git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
 216        (
 217                cd testrepo &&
 218                echo "$the_commit commit        refs/remotes/origin/master" >expect &&
 219                git for-each-ref refs/remotes/origin >actual &&
 220                test_cmp expect actual
 221        )
 222'
 223
 224test_expect_success 'push with pushInsteadOf' '
 225        mk_empty testrepo &&
 226        TRASH="$(pwd)/" &&
 227        test_config "url.$TRASH.pushInsteadOf" trash/ &&
 228        git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
 229        (
 230                cd testrepo &&
 231                echo "$the_commit commit        refs/remotes/origin/master" >expect &&
 232                git for-each-ref refs/remotes/origin >actual &&
 233                test_cmp expect actual
 234        )
 235'
 236
 237test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' '
 238        mk_empty testrepo &&
 239        test_config "url.trash2/.pushInsteadOf" testrepo/ &&
 240        test_config "url.trash3/.pusnInsteadOf" trash/wrong &&
 241        test_config remote.r.url trash/wrong &&
 242        test_config remote.r.pushurl "testrepo/" &&
 243        git push r refs/heads/master:refs/remotes/origin/master &&
 244        (
 245                cd testrepo &&
 246                echo "$the_commit commit        refs/remotes/origin/master" >expect &&
 247                git for-each-ref refs/remotes/origin >actual &&
 248                test_cmp expect actual
 249        )
 250'
 251
 252test_expect_success 'push with matching heads' '
 253
 254        mk_test testrepo heads/master &&
 255        git push testrepo : &&
 256        check_push_result testrepo $the_commit heads/master
 257
 258'
 259
 260test_expect_success 'push with matching heads on the command line' '
 261
 262        mk_test testrepo heads/master &&
 263        git push testrepo : &&
 264        check_push_result testrepo $the_commit heads/master
 265
 266'
 267
 268test_expect_success 'failed (non-fast-forward) push with matching heads' '
 269
 270        mk_test testrepo heads/master &&
 271        git push testrepo : &&
 272        git commit --amend -massaged &&
 273        test_must_fail git push testrepo &&
 274        check_push_result testrepo $the_commit heads/master &&
 275        git reset --hard $the_commit
 276
 277'
 278
 279test_expect_success 'push --force with matching heads' '
 280
 281        mk_test testrepo heads/master &&
 282        git push testrepo : &&
 283        git commit --amend -massaged &&
 284        git push --force testrepo : &&
 285        ! check_push_result testrepo $the_commit heads/master &&
 286        git reset --hard $the_commit
 287
 288'
 289
 290test_expect_success 'push with matching heads and forced update' '
 291
 292        mk_test testrepo heads/master &&
 293        git push testrepo : &&
 294        git commit --amend -massaged &&
 295        git push testrepo +: &&
 296        ! check_push_result testrepo $the_commit heads/master &&
 297        git reset --hard $the_commit
 298
 299'
 300
 301test_expect_success 'push with no ambiguity (1)' '
 302
 303        mk_test testrepo heads/master &&
 304        git push testrepo master:master &&
 305        check_push_result testrepo $the_commit heads/master
 306
 307'
 308
 309test_expect_success 'push with no ambiguity (2)' '
 310
 311        mk_test testrepo remotes/origin/master &&
 312        git push testrepo master:origin/master &&
 313        check_push_result testrepo $the_commit remotes/origin/master
 314
 315'
 316
 317test_expect_success 'push with colon-less refspec, no ambiguity' '
 318
 319        mk_test testrepo heads/master heads/t/master &&
 320        git branch -f t/master master &&
 321        git push testrepo master &&
 322        check_push_result testrepo $the_commit heads/master &&
 323        check_push_result testrepo $the_first_commit heads/t/master
 324
 325'
 326
 327test_expect_success 'push with weak ambiguity (1)' '
 328
 329        mk_test testrepo heads/master remotes/origin/master &&
 330        git push testrepo master:master &&
 331        check_push_result testrepo $the_commit heads/master &&
 332        check_push_result testrepo $the_first_commit remotes/origin/master
 333
 334'
 335
 336test_expect_success 'push with weak ambiguity (2)' '
 337
 338        mk_test testrepo heads/master remotes/origin/master remotes/another/master &&
 339        git push testrepo master:master &&
 340        check_push_result testrepo $the_commit heads/master &&
 341        check_push_result testrepo $the_first_commit remotes/origin/master remotes/another/master
 342
 343'
 344
 345test_expect_success 'push with ambiguity' '
 346
 347        mk_test testrepo heads/frotz tags/frotz &&
 348        test_must_fail git push testrepo master:frotz &&
 349        check_push_result testrepo $the_first_commit heads/frotz tags/frotz
 350
 351'
 352
 353test_expect_success 'push with colon-less refspec (1)' '
 354
 355        mk_test testrepo heads/frotz tags/frotz &&
 356        git branch -f frotz master &&
 357        git push testrepo frotz &&
 358        check_push_result testrepo $the_commit heads/frotz &&
 359        check_push_result testrepo $the_first_commit tags/frotz
 360
 361'
 362
 363test_expect_success 'push with colon-less refspec (2)' '
 364
 365        mk_test testrepo heads/frotz tags/frotz &&
 366        if git show-ref --verify -q refs/heads/frotz
 367        then
 368                git branch -D frotz
 369        fi &&
 370        git tag -f frotz &&
 371        git push -f testrepo frotz &&
 372        check_push_result testrepo $the_commit tags/frotz &&
 373        check_push_result testrepo $the_first_commit heads/frotz
 374
 375'
 376
 377test_expect_success 'push with colon-less refspec (3)' '
 378
 379        mk_test testrepo &&
 380        if git show-ref --verify -q refs/tags/frotz
 381        then
 382                git tag -d frotz
 383        fi &&
 384        git branch -f frotz master &&
 385        git push testrepo frotz &&
 386        check_push_result testrepo $the_commit heads/frotz &&
 387        test 1 = $( cd testrepo && git show-ref | wc -l )
 388'
 389
 390test_expect_success 'push with colon-less refspec (4)' '
 391
 392        mk_test testrepo &&
 393        if git show-ref --verify -q refs/heads/frotz
 394        then
 395                git branch -D frotz
 396        fi &&
 397        git tag -f frotz &&
 398        git push testrepo frotz &&
 399        check_push_result testrepo $the_commit tags/frotz &&
 400        test 1 = $( cd testrepo && git show-ref | wc -l )
 401
 402'
 403
 404test_expect_success 'push head with non-existent, incomplete dest' '
 405
 406        mk_test testrepo &&
 407        git push testrepo master:branch &&
 408        check_push_result testrepo $the_commit heads/branch
 409
 410'
 411
 412test_expect_success 'push tag with non-existent, incomplete dest' '
 413
 414        mk_test testrepo &&
 415        git tag -f v1.0 &&
 416        git push testrepo v1.0:tag &&
 417        check_push_result testrepo $the_commit tags/tag
 418
 419'
 420
 421test_expect_success 'push sha1 with non-existent, incomplete dest' '
 422
 423        mk_test testrepo &&
 424        test_must_fail git push testrepo `git rev-parse master`:foo
 425
 426'
 427
 428test_expect_success 'push ref expression with non-existent, incomplete dest' '
 429
 430        mk_test testrepo &&
 431        test_must_fail git push testrepo master^:branch
 432
 433'
 434
 435test_expect_success 'push with HEAD' '
 436
 437        mk_test testrepo heads/master &&
 438        git checkout master &&
 439        git push testrepo HEAD &&
 440        check_push_result testrepo $the_commit heads/master
 441
 442'
 443
 444test_expect_success 'push with HEAD nonexisting at remote' '
 445
 446        mk_test testrepo heads/master &&
 447        git checkout -b local master &&
 448        git push testrepo HEAD &&
 449        check_push_result testrepo $the_commit heads/local
 450'
 451
 452test_expect_success 'push with +HEAD' '
 453
 454        mk_test testrepo heads/master &&
 455        git checkout master &&
 456        git branch -D local &&
 457        git checkout -b local &&
 458        git push testrepo master local &&
 459        check_push_result testrepo $the_commit heads/master &&
 460        check_push_result testrepo $the_commit heads/local &&
 461
 462        # Without force rewinding should fail
 463        git reset --hard HEAD^ &&
 464        test_must_fail git push testrepo HEAD &&
 465        check_push_result testrepo $the_commit heads/local &&
 466
 467        # With force rewinding should succeed
 468        git push testrepo +HEAD &&
 469        check_push_result testrepo $the_first_commit heads/local
 470
 471'
 472
 473test_expect_success 'push HEAD with non-existent, incomplete dest' '
 474
 475        mk_test testrepo &&
 476        git checkout master &&
 477        git push testrepo HEAD:branch &&
 478        check_push_result testrepo $the_commit heads/branch
 479
 480'
 481
 482test_expect_success 'push with config remote.*.push = HEAD' '
 483
 484        mk_test testrepo heads/local &&
 485        git checkout master &&
 486        git branch -f local $the_commit &&
 487        (
 488                cd testrepo &&
 489                git checkout local &&
 490                git reset --hard $the_first_commit
 491        ) &&
 492        test_config remote.there.url testrepo &&
 493        test_config remote.there.push HEAD &&
 494        test_config branch.master.remote there &&
 495        git push &&
 496        check_push_result testrepo $the_commit heads/master &&
 497        check_push_result testrepo $the_first_commit heads/local
 498'
 499
 500test_expect_success 'push with remote.pushdefault' '
 501        mk_test up_repo heads/master &&
 502        mk_test down_repo heads/master &&
 503        test_config remote.up.url up_repo &&
 504        test_config remote.down.url down_repo &&
 505        test_config branch.master.remote up &&
 506        test_config remote.pushdefault down &&
 507        test_config push.default matching &&
 508        git push &&
 509        check_push_result up_repo $the_first_commit heads/master &&
 510        check_push_result down_repo $the_commit heads/master
 511'
 512
 513test_expect_success 'push with config remote.*.pushurl' '
 514
 515        mk_test testrepo heads/master &&
 516        git checkout master &&
 517        test_config remote.there.url test2repo &&
 518        test_config remote.there.pushurl testrepo &&
 519        git push there : &&
 520        check_push_result testrepo $the_commit heads/master
 521'
 522
 523test_expect_success 'push with config branch.*.pushremote' '
 524        mk_test up_repo heads/master &&
 525        mk_test side_repo heads/master &&
 526        mk_test down_repo heads/master &&
 527        test_config remote.up.url up_repo &&
 528        test_config remote.pushdefault side_repo &&
 529        test_config remote.down.url down_repo &&
 530        test_config branch.master.remote up &&
 531        test_config branch.master.pushremote down &&
 532        test_config push.default matching &&
 533        git push &&
 534        check_push_result up_repo $the_first_commit heads/master &&
 535        check_push_result side_repo $the_first_commit heads/master &&
 536        check_push_result down_repo $the_commit heads/master
 537'
 538
 539test_expect_success 'push with dry-run' '
 540
 541        mk_test testrepo heads/master &&
 542        (
 543                cd testrepo &&
 544                old_commit=$(git show-ref -s --verify refs/heads/master)
 545        ) &&
 546        git push --dry-run testrepo : &&
 547        check_push_result testrepo $old_commit heads/master
 548'
 549
 550test_expect_success 'push updates local refs' '
 551
 552        mk_test testrepo heads/master &&
 553        mk_child testrepo child &&
 554        (
 555                cd child &&
 556                git pull .. master &&
 557                git push &&
 558                test $(git rev-parse master) = \
 559                        $(git rev-parse remotes/origin/master)
 560        )
 561
 562'
 563
 564test_expect_success 'push updates up-to-date local refs' '
 565
 566        mk_test testrepo heads/master &&
 567        mk_child testrepo child1 &&
 568        mk_child testrepo child2 &&
 569        (cd child1 && git pull .. master && git push) &&
 570        (
 571                cd child2 &&
 572                git pull ../child1 master &&
 573                git push &&
 574                test $(git rev-parse master) = \
 575                        $(git rev-parse remotes/origin/master)
 576        )
 577
 578'
 579
 580test_expect_success 'push preserves up-to-date packed refs' '
 581
 582        mk_test testrepo heads/master &&
 583        mk_child testrepo child &&
 584        (
 585                cd child &&
 586                git push &&
 587                ! test -f .git/refs/remotes/origin/master
 588        )
 589
 590'
 591
 592test_expect_success 'push does not update local refs on failure' '
 593
 594        mk_test testrepo heads/master &&
 595        mk_child testrepo child &&
 596        mkdir testrepo/.git/hooks &&
 597        echo "#!/no/frobnication/today" >testrepo/.git/hooks/pre-receive &&
 598        chmod +x testrepo/.git/hooks/pre-receive &&
 599        (
 600                cd child &&
 601                git pull .. master
 602                test_must_fail git push &&
 603                test $(git rev-parse master) != \
 604                        $(git rev-parse remotes/origin/master)
 605        )
 606
 607'
 608
 609test_expect_success 'allow deleting an invalid remote ref' '
 610
 611        mk_test testrepo heads/master &&
 612        rm -f testrepo/.git/objects/??/* &&
 613        git push testrepo :refs/heads/master &&
 614        (cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
 615
 616'
 617
 618test_expect_success 'pushing valid refs triggers post-receive and post-update hooks' '
 619        mk_test_with_hooks testrepo heads/master heads/next &&
 620        orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
 621        newmaster=$(git show-ref -s --verify refs/heads/master) &&
 622        orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
 623        newnext=$_z40 &&
 624        git push testrepo refs/heads/master:refs/heads/master :refs/heads/next &&
 625        (
 626                cd testrepo/.git &&
 627                cat >pre-receive.expect <<-EOF &&
 628                $orgmaster $newmaster refs/heads/master
 629                $orgnext $newnext refs/heads/next
 630                EOF
 631
 632                cat >update.expect <<-EOF &&
 633                refs/heads/master $orgmaster $newmaster
 634                refs/heads/next $orgnext $newnext
 635                EOF
 636
 637                cat >post-receive.expect <<-EOF &&
 638                $orgmaster $newmaster refs/heads/master
 639                $orgnext $newnext refs/heads/next
 640                EOF
 641
 642                cat >post-update.expect <<-EOF &&
 643                refs/heads/master
 644                refs/heads/next
 645                EOF
 646
 647                test_cmp pre-receive.expect pre-receive.actual &&
 648                test_cmp update.expect update.actual &&
 649                test_cmp post-receive.expect post-receive.actual &&
 650                test_cmp post-update.expect post-update.actual
 651        )
 652'
 653
 654test_expect_success 'deleting dangling ref triggers hooks with correct args' '
 655        mk_test_with_hooks testrepo heads/master &&
 656        rm -f testrepo/.git/objects/??/* &&
 657        git push testrepo :refs/heads/master &&
 658        (
 659                cd testrepo/.git &&
 660                cat >pre-receive.expect <<-EOF &&
 661                $_z40 $_z40 refs/heads/master
 662                EOF
 663
 664                cat >update.expect <<-EOF &&
 665                refs/heads/master $_z40 $_z40
 666                EOF
 667
 668                cat >post-receive.expect <<-EOF &&
 669                $_z40 $_z40 refs/heads/master
 670                EOF
 671
 672                cat >post-update.expect <<-EOF &&
 673                refs/heads/master
 674                EOF
 675
 676                test_cmp pre-receive.expect pre-receive.actual &&
 677                test_cmp update.expect update.actual &&
 678                test_cmp post-receive.expect post-receive.actual &&
 679                test_cmp post-update.expect post-update.actual
 680        )
 681'
 682
 683test_expect_success 'deletion of a non-existent ref is not fed to post-receive and post-update hooks' '
 684        mk_test_with_hooks testrepo heads/master &&
 685        orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
 686        newmaster=$(git show-ref -s --verify refs/heads/master) &&
 687        git push testrepo master :refs/heads/nonexistent &&
 688        (
 689                cd testrepo/.git &&
 690                cat >pre-receive.expect <<-EOF &&
 691                $orgmaster $newmaster refs/heads/master
 692                $_z40 $_z40 refs/heads/nonexistent
 693                EOF
 694
 695                cat >update.expect <<-EOF &&
 696                refs/heads/master $orgmaster $newmaster
 697                refs/heads/nonexistent $_z40 $_z40
 698                EOF
 699
 700                cat >post-receive.expect <<-EOF &&
 701                $orgmaster $newmaster refs/heads/master
 702                EOF
 703
 704                cat >post-update.expect <<-EOF &&
 705                refs/heads/master
 706                EOF
 707
 708                test_cmp pre-receive.expect pre-receive.actual &&
 709                test_cmp update.expect update.actual &&
 710                test_cmp post-receive.expect post-receive.actual &&
 711                test_cmp post-update.expect post-update.actual
 712        )
 713'
 714
 715test_expect_success 'deletion of a non-existent ref alone does trigger post-receive and post-update hooks' '
 716        mk_test_with_hooks testrepo heads/master &&
 717        git push testrepo :refs/heads/nonexistent &&
 718        (
 719                cd testrepo/.git &&
 720                cat >pre-receive.expect <<-EOF &&
 721                $_z40 $_z40 refs/heads/nonexistent
 722                EOF
 723
 724                cat >update.expect <<-EOF &&
 725                refs/heads/nonexistent $_z40 $_z40
 726                EOF
 727
 728                test_cmp pre-receive.expect pre-receive.actual &&
 729                test_cmp update.expect update.actual &&
 730                test_path_is_missing post-receive.actual &&
 731                test_path_is_missing post-update.actual
 732        )
 733'
 734
 735test_expect_success 'mixed ref updates, deletes, invalid deletes trigger hooks with correct input' '
 736        mk_test_with_hooks testrepo heads/master heads/next heads/pu &&
 737        orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
 738        newmaster=$(git show-ref -s --verify refs/heads/master) &&
 739        orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
 740        newnext=$_z40 &&
 741        orgpu=$(cd testrepo && git show-ref -s --verify refs/heads/pu) &&
 742        newpu=$(git show-ref -s --verify refs/heads/master) &&
 743        git push testrepo refs/heads/master:refs/heads/master \
 744            refs/heads/master:refs/heads/pu :refs/heads/next \
 745            :refs/heads/nonexistent &&
 746        (
 747                cd testrepo/.git &&
 748                cat >pre-receive.expect <<-EOF &&
 749                $orgmaster $newmaster refs/heads/master
 750                $orgnext $newnext refs/heads/next
 751                $orgpu $newpu refs/heads/pu
 752                $_z40 $_z40 refs/heads/nonexistent
 753                EOF
 754
 755                cat >update.expect <<-EOF &&
 756                refs/heads/master $orgmaster $newmaster
 757                refs/heads/next $orgnext $newnext
 758                refs/heads/pu $orgpu $newpu
 759                refs/heads/nonexistent $_z40 $_z40
 760                EOF
 761
 762                cat >post-receive.expect <<-EOF &&
 763                $orgmaster $newmaster refs/heads/master
 764                $orgnext $newnext refs/heads/next
 765                $orgpu $newpu refs/heads/pu
 766                EOF
 767
 768                cat >post-update.expect <<-EOF &&
 769                refs/heads/master
 770                refs/heads/next
 771                refs/heads/pu
 772                EOF
 773
 774                test_cmp pre-receive.expect pre-receive.actual &&
 775                test_cmp update.expect update.actual &&
 776                test_cmp post-receive.expect post-receive.actual &&
 777                test_cmp post-update.expect post-update.actual
 778        )
 779'
 780
 781test_expect_success 'allow deleting a ref using --delete' '
 782        mk_test testrepo heads/master &&
 783        (cd testrepo && git config receive.denyDeleteCurrent warn) &&
 784        git push testrepo --delete master &&
 785        (cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
 786'
 787
 788test_expect_success 'allow deleting a tag using --delete' '
 789        mk_test testrepo heads/master &&
 790        git tag -a -m dummy_message deltag heads/master &&
 791        git push testrepo --tags &&
 792        (cd testrepo && git rev-parse --verify -q refs/tags/deltag) &&
 793        git push testrepo --delete tag deltag &&
 794        (cd testrepo && test_must_fail git rev-parse --verify refs/tags/deltag)
 795'
 796
 797test_expect_success 'push --delete without args aborts' '
 798        mk_test testrepo heads/master &&
 799        test_must_fail git push testrepo --delete
 800'
 801
 802test_expect_success 'push --delete refuses src:dest refspecs' '
 803        mk_test testrepo heads/master &&
 804        test_must_fail git push testrepo --delete master:foo
 805'
 806
 807test_expect_success 'warn on push to HEAD of non-bare repository' '
 808        mk_test testrepo heads/master &&
 809        (
 810                cd testrepo &&
 811                git checkout master &&
 812                git config receive.denyCurrentBranch warn
 813        ) &&
 814        git push testrepo master 2>stderr &&
 815        grep "warning: updating the current branch" stderr
 816'
 817
 818test_expect_success 'deny push to HEAD of non-bare repository' '
 819        mk_test testrepo heads/master &&
 820        (
 821                cd testrepo &&
 822                git checkout master &&
 823                git config receive.denyCurrentBranch true
 824        ) &&
 825        test_must_fail git push testrepo master
 826'
 827
 828test_expect_success 'allow push to HEAD of bare repository (bare)' '
 829        mk_test testrepo heads/master &&
 830        (
 831                cd testrepo &&
 832                git checkout master &&
 833                git config receive.denyCurrentBranch true &&
 834                git config core.bare true
 835        ) &&
 836        git push testrepo master 2>stderr &&
 837        ! grep "warning: updating the current branch" stderr
 838'
 839
 840test_expect_success 'allow push to HEAD of non-bare repository (config)' '
 841        mk_test testrepo heads/master &&
 842        (
 843                cd testrepo &&
 844                git checkout master &&
 845                git config receive.denyCurrentBranch false
 846        ) &&
 847        git push testrepo master 2>stderr &&
 848        ! grep "warning: updating the current branch" stderr
 849'
 850
 851test_expect_success 'fetch with branches' '
 852        mk_empty testrepo &&
 853        git branch second $the_first_commit &&
 854        git checkout second &&
 855        echo ".." > testrepo/.git/branches/branch1 &&
 856        (
 857                cd testrepo &&
 858                git fetch branch1 &&
 859                echo "$the_commit commit        refs/heads/branch1" >expect &&
 860                git for-each-ref refs/heads >actual &&
 861                test_cmp expect actual
 862        ) &&
 863        git checkout master
 864'
 865
 866test_expect_success 'fetch with branches containing #' '
 867        mk_empty testrepo &&
 868        echo "..#second" > testrepo/.git/branches/branch2 &&
 869        (
 870                cd testrepo &&
 871                git fetch branch2 &&
 872                echo "$the_first_commit commit  refs/heads/branch2" >expect &&
 873                git for-each-ref refs/heads >actual &&
 874                test_cmp expect actual
 875        ) &&
 876        git checkout master
 877'
 878
 879test_expect_success 'push with branches' '
 880        mk_empty testrepo &&
 881        git checkout second &&
 882        echo "testrepo" > .git/branches/branch1 &&
 883        git push branch1 &&
 884        (
 885                cd testrepo &&
 886                echo "$the_first_commit commit  refs/heads/master" >expect &&
 887                git for-each-ref refs/heads >actual &&
 888                test_cmp expect actual
 889        )
 890'
 891
 892test_expect_success 'push with branches containing #' '
 893        mk_empty testrepo &&
 894        echo "testrepo#branch3" > .git/branches/branch2 &&
 895        git push branch2 &&
 896        (
 897                cd testrepo &&
 898                echo "$the_first_commit commit  refs/heads/branch3" >expect &&
 899                git for-each-ref refs/heads >actual &&
 900                test_cmp expect actual
 901        ) &&
 902        git checkout master
 903'
 904
 905test_expect_success 'push into aliased refs (consistent)' '
 906        mk_test testrepo heads/master &&
 907        mk_child testrepo child1 &&
 908        mk_child testrepo child2 &&
 909        (
 910                cd child1 &&
 911                git branch foo &&
 912                git symbolic-ref refs/heads/bar refs/heads/foo
 913                git config receive.denyCurrentBranch false
 914        ) &&
 915        (
 916                cd child2 &&
 917                >path2 &&
 918                git add path2 &&
 919                test_tick &&
 920                git commit -a -m child2 &&
 921                git branch foo &&
 922                git branch bar &&
 923                git push ../child1 foo bar
 924        )
 925'
 926
 927test_expect_success 'push into aliased refs (inconsistent)' '
 928        mk_test testrepo heads/master &&
 929        mk_child testrepo child1 &&
 930        mk_child testrepo child2 &&
 931        (
 932                cd child1 &&
 933                git branch foo &&
 934                git symbolic-ref refs/heads/bar refs/heads/foo
 935                git config receive.denyCurrentBranch false
 936        ) &&
 937        (
 938                cd child2 &&
 939                >path2 &&
 940                git add path2 &&
 941                test_tick &&
 942                git commit -a -m child2 &&
 943                git branch foo &&
 944                >path3 &&
 945                git add path3 &&
 946                test_tick &&
 947                git commit -a -m child2 &&
 948                git branch bar &&
 949                test_must_fail git push ../child1 foo bar 2>stderr &&
 950                grep "refusing inconsistent update" stderr
 951        )
 952'
 953
 954test_expect_success 'push requires --force to update lightweight tag' '
 955        mk_test testrepo heads/master &&
 956        mk_child testrepo child1 &&
 957        mk_child testrepo child2 &&
 958        (
 959                cd child1 &&
 960                git tag Tag &&
 961                git push ../child2 Tag &&
 962                git push ../child2 Tag &&
 963                >file1 &&
 964                git add file1 &&
 965                git commit -m "file1" &&
 966                git tag -f Tag &&
 967                test_must_fail git push ../child2 Tag &&
 968                git push --force ../child2 Tag &&
 969                git tag -f Tag &&
 970                test_must_fail git push ../child2 Tag HEAD~ &&
 971                git push --force ../child2 Tag
 972        )
 973'
 974
 975test_expect_success 'push --porcelain' '
 976        mk_empty testrepo &&
 977        echo >.git/foo  "To testrepo" &&
 978        echo >>.git/foo "*      refs/heads/master:refs/remotes/origin/master    [new branch]"  &&
 979        echo >>.git/foo "Done" &&
 980        git push >.git/bar --porcelain  testrepo refs/heads/master:refs/remotes/origin/master &&
 981        (
 982                cd testrepo &&
 983                echo "$the_commit commit        refs/remotes/origin/master" >expect &&
 984                git for-each-ref refs/remotes/origin >actual &&
 985                test_cmp expect actual
 986        ) &&
 987        test_cmp .git/foo .git/bar
 988'
 989
 990test_expect_success 'push --porcelain bad url' '
 991        mk_empty testrepo &&
 992        test_must_fail git push >.git/bar --porcelain asdfasdfasd refs/heads/master:refs/remotes/origin/master &&
 993        test_must_fail grep -q Done .git/bar
 994'
 995
 996test_expect_success 'push --porcelain rejected' '
 997        mk_empty testrepo &&
 998        git push testrepo refs/heads/master:refs/remotes/origin/master &&
 999        (cd testrepo &&
1000                git reset --hard origin/master^
1001                git config receive.denyCurrentBranch true) &&
1002
1003        echo >.git/foo  "To testrepo"  &&
1004        echo >>.git/foo "!      refs/heads/master:refs/heads/master     [remote rejected] (branch is currently checked out)" &&
1005
1006        test_must_fail git push >.git/bar --porcelain  testrepo refs/heads/master:refs/heads/master &&
1007        test_cmp .git/foo .git/bar
1008'
1009
1010test_expect_success 'push --porcelain --dry-run rejected' '
1011        mk_empty testrepo &&
1012        git push testrepo refs/heads/master:refs/remotes/origin/master &&
1013        (cd testrepo &&
1014                git reset --hard origin/master
1015                git config receive.denyCurrentBranch true) &&
1016
1017        echo >.git/foo  "To testrepo"  &&
1018        echo >>.git/foo "!      refs/heads/master^:refs/heads/master    [rejected] (non-fast-forward)" &&
1019        echo >>.git/foo "Done" &&
1020
1021        test_must_fail git push >.git/bar --porcelain  --dry-run testrepo refs/heads/master^:refs/heads/master &&
1022        test_cmp .git/foo .git/bar
1023'
1024
1025test_expect_success 'push --prune' '
1026        mk_test testrepo heads/master heads/second heads/foo heads/bar &&
1027        git push --prune testrepo : &&
1028        check_push_result testrepo $the_commit heads/master &&
1029        check_push_result testrepo $the_first_commit heads/second &&
1030        ! check_push_result testrepo $the_first_commit heads/foo heads/bar
1031'
1032
1033test_expect_success 'push --prune refspec' '
1034        mk_test testrepo tmp/master tmp/second tmp/foo tmp/bar &&
1035        git push --prune testrepo "refs/heads/*:refs/tmp/*" &&
1036        check_push_result testrepo $the_commit tmp/master &&
1037        check_push_result testrepo $the_first_commit tmp/second &&
1038        ! check_push_result testrepo $the_first_commit tmp/foo tmp/bar
1039'
1040
1041for configsection in transfer receive
1042do
1043        test_expect_success "push to update a ref hidden by $configsection.hiderefs" '
1044                mk_test testrepo heads/master hidden/one hidden/two hidden/three &&
1045                (
1046                        cd testrepo &&
1047                        git config $configsection.hiderefs refs/hidden
1048                ) &&
1049
1050                # push to unhidden ref succeeds normally
1051                git push testrepo master:refs/heads/master &&
1052                check_push_result testrepo $the_commit heads/master &&
1053
1054                # push to update a hidden ref should fail
1055                test_must_fail git push testrepo master:refs/hidden/one &&
1056                check_push_result testrepo $the_first_commit hidden/one &&
1057
1058                # push to delete a hidden ref should fail
1059                test_must_fail git push testrepo :refs/hidden/two &&
1060                check_push_result testrepo $the_first_commit hidden/two &&
1061
1062                # idempotent push to update a hidden ref should fail
1063                test_must_fail git push testrepo $the_first_commit:refs/hidden/three &&
1064                check_push_result testrepo $the_first_commit hidden/three
1065        '
1066done
1067
1068test_expect_success 'fetch exact SHA1' '
1069        mk_test testrepo heads/master hidden/one &&
1070        git push testrepo master:refs/hidden/one &&
1071        (
1072                cd testrepo &&
1073                git config transfer.hiderefs refs/hidden
1074        ) &&
1075        check_push_result testrepo $the_commit hidden/one &&
1076
1077        mk_child testrepo child &&
1078        (
1079                cd child &&
1080
1081                # make sure $the_commit does not exist here
1082                git repack -a -d &&
1083                git prune &&
1084                test_must_fail git cat-file -t $the_commit &&
1085
1086                # fetching the hidden object should fail by default
1087                test_must_fail git fetch -v ../testrepo $the_commit:refs/heads/copy &&
1088                test_must_fail git rev-parse --verify refs/heads/copy &&
1089
1090                # the server side can allow it to succeed
1091                (
1092                        cd ../testrepo &&
1093                        git config uploadpack.allowtipsha1inwant true
1094                ) &&
1095
1096                git fetch -v ../testrepo $the_commit:refs/heads/copy &&
1097                result=$(git rev-parse --verify refs/heads/copy) &&
1098                test "$the_commit" = "$result"
1099        )
1100'
1101
1102test_expect_success 'fetch follows tags by default' '
1103        mk_test testrepo heads/master &&
1104        rm -fr src dst &&
1105        git init src &&
1106        (
1107                cd src &&
1108                git pull ../testrepo master &&
1109                git tag -m "annotated" tag &&
1110                git for-each-ref >tmp1 &&
1111                (
1112                        cat tmp1
1113                        sed -n "s|refs/heads/master$|refs/remotes/origin/master|p" tmp1
1114                ) |
1115                sort -k 3 >../expect
1116        ) &&
1117        git init dst &&
1118        (
1119                cd dst &&
1120                git remote add origin ../src &&
1121                git config branch.master.remote origin &&
1122                git config branch.master.merge refs/heads/master &&
1123                git pull &&
1124                git for-each-ref >../actual
1125        ) &&
1126        test_cmp expect actual
1127'
1128
1129test_expect_success 'push does not follow tags by default' '
1130        mk_test testrepo heads/master &&
1131        rm -fr src dst &&
1132        git init src &&
1133        git init --bare dst &&
1134        (
1135                cd src &&
1136                git pull ../testrepo master &&
1137                git tag -m "annotated" tag &&
1138                git checkout -b another &&
1139                git commit --allow-empty -m "future commit" &&
1140                git tag -m "future" future &&
1141                git checkout master &&
1142                git for-each-ref refs/heads/master >../expect &&
1143                git push ../dst master
1144        ) &&
1145        (
1146                cd dst &&
1147                git for-each-ref >../actual
1148        ) &&
1149        test_cmp expect actual
1150'
1151
1152test_expect_success 'push --follow-tag only pushes relevant tags' '
1153        mk_test testrepo heads/master &&
1154        rm -fr src dst &&
1155        git init src &&
1156        git init --bare dst &&
1157        (
1158                cd src &&
1159                git pull ../testrepo master &&
1160                git tag -m "annotated" tag &&
1161                git checkout -b another &&
1162                git commit --allow-empty -m "future commit" &&
1163                git tag -m "future" future &&
1164                git checkout master &&
1165                git for-each-ref refs/heads/master refs/tags/tag >../expect
1166                git push --follow-tag ../dst master
1167        ) &&
1168        (
1169                cd dst &&
1170                git for-each-ref >../actual
1171        ) &&
1172        test_cmp expect actual
1173'
1174
1175test_done