t/t5510-fetch.sh

   1 #!/bin/sh
   2 # Copyright (c) 2006, Junio C Hamano.
   3
   4 test_description='Per branch config variables affects "git fetch".
   5
   6 '
   7
   8 . ./test-lib.sh
   9
  10 D=$(pwd)
  11
  12 test_bundle_object_count () {
  13         git verify-pack -v "$1" >verify.out &&
  14         test "$2" = $(grep '^[0-9a-f]\{40\} ' verify.out | wc -l)
  15 }
  16
  17 convert_bundle_to_pack () {
  18         while read x && test -n "$x"
  19         do
  20                 :;
  21         done
  22         cat
  23 }
  24
  25 test_expect_success setup '
  26         echo >file original &&
  27         git add file &&
  28         git commit -a -m original'
  29
  30 test_expect_success "clone and setup child repos" '
  31         git clone . one &&
  32         (
  33                 cd one &&
  34                 echo >file updated by one &&
  35                 git commit -a -m "updated by one"
  36         ) &&
  37         git clone . two &&
  38         (
  39                 cd two &&
  40                 git config branch.master.remote one &&
  41                 git config remote.one.url ../one/.git/ &&
  42                 git config remote.one.fetch refs/heads/master:refs/heads/one
  43         ) &&
  44         git clone . three &&
  45         (
  46                 cd three &&
  47                 git config branch.master.remote two &&
  48                 git config branch.master.merge refs/heads/one &&
  49                 mkdir -p .git/remotes &&
  50                 {
  51                         echo "URL: ../two/.git/"
  52                         echo "Pull: refs/heads/master:refs/heads/two"
  53                         echo "Pull: refs/heads/one:refs/heads/one"
  54                 } >.git/remotes/two
  55         ) &&
  56         git clone . bundle &&
  57         git clone . seven
  58 '
  59
  60 test_expect_success "fetch test" '
  61         cd "$D" &&
  62         echo >file updated by origin &&
  63         git commit -a -m "updated by origin" &&
  64         cd two &&
  65         git fetch &&
  66         git rev-parse --verify refs/heads/one &&
  67         mine=$(git rev-parse refs/heads/one) &&
  68         his=$(cd ../one && git rev-parse refs/heads/master) &&
  69         test "z$mine" = "z$his"
  70 '
  71
  72 test_expect_success "fetch test for-merge" '
  73         cd "$D" &&
  74         cd three &&
  75         git fetch &&
  76         git rev-parse --verify refs/heads/two &&
  77         git rev-parse --verify refs/heads/one &&
  78         master_in_two=$(cd ../two && git rev-parse master) &&
  79         one_in_two=$(cd ../two && git rev-parse one) &&
  80         {
  81                 echo "$one_in_two       "
  82                 echo "$master_in_two    not-for-merge"
  83         } >expected &&
  84         cut -f -2 .git/FETCH_HEAD >actual &&
  85         test_cmp expected actual'
  86
  87 test_expect_success 'fetch --prune on its own works as expected' '
  88         cd "$D" &&
  89         git clone . prune &&
  90         cd prune &&
  91         git update-ref refs/remotes/origin/extrabranch master &&
  92
  93         git fetch --prune origin &&
  94         test_must_fail git rev-parse origin/extrabranch
  95 '
  96
  97 test_expect_success 'fetch --prune with a branch name keeps branches' '
  98         cd "$D" &&
  99         git clone . prune-branch &&
 100         cd prune-branch &&
 101         git update-ref refs/remotes/origin/extrabranch master &&
 102
 103         git fetch --prune origin master &&
 104         git rev-parse origin/extrabranch
 105 '
 106
 107 test_expect_success 'fetch --prune with a namespace keeps other namespaces' '
 108         cd "$D" &&
 109         git clone . prune-namespace &&
 110         cd prune-namespace &&
 111
 112         git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
 113         git rev-parse origin/master
 114 '
 115
 116 test_expect_success 'fetch --prune handles overlapping refspecs' '
 117         cd "$D" &&
 118         git update-ref refs/pull/42/head master &&
 119         git clone . prune-overlapping &&
 120         cd prune-overlapping &&
 121         git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
 122
 123         git fetch --prune origin &&
 124         git rev-parse origin/master &&
 125         git rev-parse origin/pr/42 &&
 126
 127         git config --unset-all remote.origin.fetch &&
 128         git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
 129         git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&
 130
 131         git fetch --prune origin &&
 132         git rev-parse origin/master &&
 133         git rev-parse origin/pr/42
 134 '
 135
 136 test_expect_success 'fetch --prune --tags prunes branches but not tags' '
 137         cd "$D" &&
 138         git clone . prune-tags &&
 139         cd prune-tags &&
 140         git tag sometag master &&
 141         # Create what looks like a remote-tracking branch from an earlier
 142         # fetch that has since been deleted from the remote:
 143         git update-ref refs/remotes/origin/fake-remote master &&
 144
 145         git fetch --prune --tags origin &&
 146         git rev-parse origin/master &&
 147         test_must_fail git rev-parse origin/fake-remote &&
 148         git rev-parse sometag
 149 '
 150
 151 test_expect_success 'fetch --prune --tags with branch does not prune other things' '
 152         cd "$D" &&
 153         git clone . prune-tags-branch &&
 154         cd prune-tags-branch &&
 155         git tag sometag master &&
 156         git update-ref refs/remotes/origin/extrabranch master &&
 157
 158         git fetch --prune --tags origin master &&
 159         git rev-parse origin/extrabranch &&
 160         git rev-parse sometag
 161 '
 162
 163 test_expect_success 'fetch --prune --tags with refspec prunes based on refspec' '
 164         cd "$D" &&
 165         git clone . prune-tags-refspec &&
 166         cd prune-tags-refspec &&
 167         git tag sometag master &&
 168         git update-ref refs/remotes/origin/foo/otherbranch master &&
 169         git update-ref refs/remotes/origin/extrabranch master &&
 170
 171         git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* &&
 172         test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
 173         git rev-parse origin/extrabranch &&
 174         git rev-parse sometag
 175 '
 176
 177 test_expect_success 'fetch tags when there is no tags' '
 178
 179     cd "$D" &&
 180
 181     mkdir notags &&
 182     cd notags &&
 183     git init &&
 184
 185     git fetch -t ..
 186
 187 '
 188
 189 test_expect_success 'fetch following tags' '
 190
 191         cd "$D" &&
 192         git tag -a -m 'annotated' anno HEAD &&
 193         git tag light HEAD &&
 194
 195         mkdir four &&
 196         cd four &&
 197         git init &&
 198
 199         git fetch .. :track &&
 200         git show-ref --verify refs/tags/anno &&
 201         git show-ref --verify refs/tags/light
 202
 203 '
 204
 205 test_expect_success 'fetch uses remote ref names to describe new refs' '
 206         cd "$D" &&
 207         git init descriptive &&
 208         (
 209                 cd descriptive &&
 210                 git config remote.o.url .. &&
 211                 git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" &&
 212                 git config --add remote.o.fetch "refs/others/*:refs/heads/*" &&
 213                 git fetch o
 214         ) &&
 215         git tag -a -m "Descriptive tag" descriptive-tag &&
 216         git branch descriptive-branch &&
 217         git checkout descriptive-branch &&
 218         echo "Nuts" >crazy &&
 219         git add crazy &&
 220         git commit -a -m "descriptive commit" &&
 221         git update-ref refs/others/crazy HEAD &&
 222         (
 223                 cd descriptive &&
 224                 git fetch o 2>actual &&
 225                 test_i18ngrep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
 226                 test_i18ngrep "new tag.* -> descriptive-tag$" actual &&
 227                 test_i18ngrep "new ref.* -> crazy$" actual
 228         ) &&
 229         git checkout master
 230 '
 231
 232 test_expect_success 'fetch must not resolve short tag name' '
 233
 234         cd "$D" &&
 235
 236         mkdir five &&
 237         cd five &&
 238         git init &&
 239
 240         test_must_fail git fetch .. anno:five
 241
 242 '
 243
 244 test_expect_success 'fetch can now resolve short remote name' '
 245
 246         cd "$D" &&
 247         git update-ref refs/remotes/six/HEAD HEAD &&
 248
 249         mkdir six &&
 250         cd six &&
 251         git init &&
 252
 253         git fetch .. six:six
 254 '
 255
 256 test_expect_success 'create bundle 1' '
 257         cd "$D" &&
 258         echo >file updated again by origin &&
 259         git commit -a -m "tip" &&
 260         git bundle create bundle1 master^..master
 261 '
 262
 263 test_expect_success 'header of bundle looks right' '
 264         head -n 1 "$D"/bundle1 | grep "^#" &&
 265         head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " &&
 266         head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " &&
 267         head -n 4 "$D"/bundle1 | grep "^$"
 268 '
 269
 270 test_expect_success 'create bundle 2' '
 271         cd "$D" &&
 272         git bundle create bundle2 master~2..master
 273 '
 274
 275 test_expect_success 'unbundle 1' '
 276         cd "$D/bundle" &&
 277         git checkout -b some-branch &&
 278         test_must_fail git fetch "$D/bundle1" master:master
 279 '
 280
 281
 282 test_expect_success 'bundle 1 has only 3 files ' '
 283         cd "$D" &&
 284         convert_bundle_to_pack <bundle1 >bundle.pack &&
 285         git index-pack bundle.pack &&
 286         test_bundle_object_count bundle.pack 3
 287 '
 288
 289 test_expect_success 'unbundle 2' '
 290         cd "$D/bundle" &&
 291         git fetch ../bundle2 master:master &&
 292         test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)"
 293 '
 294
 295 test_expect_success 'bundle does not prerequisite objects' '
 296         cd "$D" &&
 297         touch file2 &&
 298         git add file2 &&
 299         git commit -m add.file2 file2 &&
 300         git bundle create bundle3 -1 HEAD &&
 301         convert_bundle_to_pack <bundle3 >bundle.pack &&
 302         git index-pack bundle.pack &&
 303         test_bundle_object_count bundle.pack 3
 304 '
 305
 306 test_expect_success 'bundle should be able to create a full history' '
 307
 308         cd "$D" &&
 309         git tag -a -m '1.0' v1.0 master &&
 310         git bundle create bundle4 v1.0
 311
 312 '
 313
 314 test_expect_success 'fetch with a non-applying branch.<name>.merge' '
 315         git config branch.master.remote yeti &&
 316         git config branch.master.merge refs/heads/bigfoot &&
 317         git config remote.blub.url one &&
 318         git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
 319         git fetch blub
 320 '
 321
 322 # URL supplied to fetch does not match the url of the configured branch's remote
 323 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
 324         one_head=$(cd one && git rev-parse HEAD) &&
 325         this_head=$(git rev-parse HEAD) &&
 326         git update-ref -d FETCH_HEAD &&
 327         git fetch one &&
 328         test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
 329         test $this_head = "$(git rev-parse --verify HEAD)"
 330 '
 331
 332 # URL supplied to fetch matches the url of the configured branch's remote and
 333 # the merge spec matches the branch the remote HEAD points to
 334 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
 335         one_ref=$(cd one && git symbolic-ref HEAD) &&
 336         git config branch.master.remote blub &&
 337         git config branch.master.merge "$one_ref" &&
 338         git update-ref -d FETCH_HEAD &&
 339         git fetch one &&
 340         test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
 341         test $this_head = "$(git rev-parse --verify HEAD)"
 342 '
 343
 344 # URL supplied to fetch matches the url of the configured branch's remote, but
 345 # the merge spec does not match the branch the remote HEAD points to
 346 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
 347         git config branch.master.merge "${one_ref}_not" &&
 348         git update-ref -d FETCH_HEAD &&
 349         git fetch one &&
 350         test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
 351         test $this_head = "$(git rev-parse --verify HEAD)"
 352 '
 353
 354 # the strange name is: a\!'b
 355 test_expect_success 'quoting of a strangely named repo' '
 356         test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
 357         grep "fatal: '\''a\\\\!'\''b'\''" result
 358 '
 359
 360 test_expect_success 'bundle should record HEAD correctly' '
 361
 362         cd "$D" &&
 363         git bundle create bundle5 HEAD master &&
 364         git bundle list-heads bundle5 >actual &&
 365         for h in HEAD refs/heads/master
 366         do
 367                 echo "$(git rev-parse --verify $h) $h"
 368         done >expect &&
 369         test_cmp expect actual
 370
 371 '
 372
 373 test_expect_success 'mark initial state of origin/master' '
 374         (
 375                 cd three &&
 376                 git tag base-origin-master refs/remotes/origin/master
 377         )
 378 '
 379
 380 test_expect_success 'explicit fetch should update tracking' '
 381
 382         cd "$D" &&
 383         git branch -f side &&
 384         (
 385                 cd three &&
 386                 git update-ref refs/remotes/origin/master base-origin-master &&
 387                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 388                 git fetch origin master &&
 389                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 390                 test "$o" != "$n" &&
 391                 test_must_fail git rev-parse --verify refs/remotes/origin/side
 392         )
 393 '
 394
 395 test_expect_success 'explicit pull should update tracking' '
 396
 397         cd "$D" &&
 398         git branch -f side &&
 399         (
 400                 cd three &&
 401                 git update-ref refs/remotes/origin/master base-origin-master &&
 402                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 403                 git pull origin master &&
 404                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 405                 test "$o" != "$n" &&
 406                 test_must_fail git rev-parse --verify refs/remotes/origin/side
 407         )
 408 '
 409
 410 test_expect_success 'explicit --refmap is allowed only with command-line refspec' '
 411         cd "$D" &&
 412         (
 413                 cd three &&
 414                 test_must_fail git fetch --refmap="*:refs/remotes/none/*"
 415         )
 416 '
 417
 418 test_expect_success 'explicit --refmap option overrides remote.*.fetch' '
 419         cd "$D" &&
 420         git branch -f side &&
 421         (
 422                 cd three &&
 423                 git update-ref refs/remotes/origin/master base-origin-master &&
 424                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 425                 git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin master &&
 426                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 427                 test "$o" = "$n" &&
 428                 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
 429                 git rev-parse --verify refs/remotes/other/master
 430         )
 431 '
 432
 433 test_expect_success 'explicitly empty --refmap option disables remote.*.fetch' '
 434         cd "$D" &&
 435         git branch -f side &&
 436         (
 437                 cd three &&
 438                 git update-ref refs/remotes/origin/master base-origin-master &&
 439                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 440                 git fetch --refmap="" origin master &&
 441                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 442                 test "$o" = "$n" &&
 443                 test_must_fail git rev-parse --verify refs/remotes/origin/side
 444         )
 445 '
 446
 447 test_expect_success 'configured fetch updates tracking' '
 448
 449         cd "$D" &&
 450         git branch -f side &&
 451         (
 452                 cd three &&
 453                 git update-ref refs/remotes/origin/master base-origin-master &&
 454                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 455                 git fetch origin &&
 456                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 457                 test "$o" != "$n" &&
 458                 git rev-parse --verify refs/remotes/origin/side
 459         )
 460 '
 461
 462 test_expect_success 'non-matching refspecs do not confuse tracking update' '
 463         cd "$D" &&
 464         git update-ref refs/odd/location HEAD &&
 465         (
 466                 cd three &&
 467                 git update-ref refs/remotes/origin/master base-origin-master &&
 468                 git config --add remote.origin.fetch \
 469                         refs/odd/location:refs/remotes/origin/odd &&
 470                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 471                 git fetch origin master &&
 472                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 473                 test "$o" != "$n" &&
 474                 test_must_fail git rev-parse --verify refs/remotes/origin/odd
 475         )
 476 '
 477
 478 test_expect_success 'pushing nonexistent branch by mistake should not segv' '
 479
 480         cd "$D" &&
 481         test_must_fail git push seven no:no
 482
 483 '
 484
 485 test_expect_success 'auto tag following fetches minimum' '
 486
 487         cd "$D" &&
 488         git clone .git follow &&
 489         git checkout HEAD^0 &&
 490         (
 491                 for i in 1 2 3 4 5 6 7
 492                 do
 493                         echo $i >>file &&
 494                         git commit -m $i -a &&
 495                         git tag -a -m $i excess-$i || exit 1
 496                 done
 497         ) &&
 498         git checkout master &&
 499         (
 500                 cd follow &&
 501                 git fetch
 502         )
 503 '
 504
 505 test_expect_success 'refuse to fetch into the current branch' '
 506
 507         test_must_fail git fetch . side:master
 508
 509 '
 510
 511 test_expect_success 'fetch into the current branch with --update-head-ok' '
 512
 513         git fetch --update-head-ok . side:master
 514
 515 '
 516
 517 test_expect_success 'fetch --dry-run' '
 518
 519         rm -f .git/FETCH_HEAD &&
 520         git fetch --dry-run . &&
 521         ! test -f .git/FETCH_HEAD
 522 '
 523
 524 test_expect_success "should be able to fetch with duplicate refspecs" '
 525         mkdir dups &&
 526         (
 527                 cd dups &&
 528                 git init &&
 529                 git config branch.master.remote three &&
 530                 git config remote.three.url ../three/.git &&
 531                 git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
 532                 git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
 533                 git fetch three
 534         )
 535 '
 536
 537 test_expect_success 'LHS of refspec follows ref disambiguation rules' '
 538         mkdir lhs-ambiguous &&
 539         (
 540                 cd lhs-ambiguous &&
 541                 git init server &&
 542                 test_commit -C server unwanted &&
 543                 test_commit -C server wanted &&
 544
 545                 git init client &&
 546
 547                 # Check a name coming after "refs" alphabetically ...
 548                 git -C server update-ref refs/heads/s wanted &&
 549                 git -C server update-ref refs/heads/refs/heads/s unwanted &&
 550                 git -C client fetch ../server +refs/heads/s:refs/heads/checkthis &&
 551                 git -C server rev-parse wanted >expect &&
 552                 git -C client rev-parse checkthis >actual &&
 553                 test_cmp expect actual &&
 554
 555                 # ... and one before.
 556                 git -C server update-ref refs/heads/q wanted &&
 557                 git -C server update-ref refs/heads/refs/heads/q unwanted &&
 558                 git -C client fetch ../server +refs/heads/q:refs/heads/checkthis &&
 559                 git -C server rev-parse wanted >expect &&
 560                 git -C client rev-parse checkthis >actual &&
 561                 test_cmp expect actual &&
 562
 563                 # Tags are preferred over branches like refs/{heads,tags}/*
 564                 git -C server update-ref refs/tags/t wanted &&
 565                 git -C server update-ref refs/heads/t unwanted &&
 566                 git -C client fetch ../server +t:refs/heads/checkthis &&
 567                 git -C server rev-parse wanted >expect &&
 568                 git -C client rev-parse checkthis >actual
 569         )
 570 '
 571
 572 test_expect_success 'fetch.writeCommitGraph' '
 573         git clone three write &&
 574         (
 575                 cd three &&
 576                 test_commit new
 577         ) &&
 578         (
 579                 cd write &&
 580                 git -c fetch.writeCommitGraph fetch origin &&
 581                 test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
 582         )
 583 '
 584
 585 test_expect_success 'fetch.writeCommitGraph with submodules' '
 586         git clone dups super &&
 587         (
 588                 cd super &&
 589                 git submodule add "file://$TRASH_DIRECTORY/three" &&
 590                 git commit -m "add submodule"
 591         ) &&
 592         git clone "super" super-clone &&
 593         (
 594                 cd super-clone &&
 595                 rm -rf .git/objects/info &&
 596                 git -c fetch.writeCommitGraph=true fetch origin &&
 597                 test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
 598         )
 599 '
 600
 601 # configured prune tests
 602
 603 set_config_tristate () {
 604         # var=$1 val=$2
 605         case "$2" in
 606         unset)
 607                 test_unconfig "$1"
 608                 ;;
 609         *)
 610                 git config "$1" "$2"
 611                 key=$(echo $1 | sed -e 's/^remote\.origin/fetch/')
 612                 git_fetch_c="$git_fetch_c -c $key=$2"
 613                 ;;
 614         esac
 615 }
 616
 617 test_configured_prune () {
 618         test_configured_prune_type "$@" "name"
 619         test_configured_prune_type "$@" "link"
 620 }
 621
 622 test_configured_prune_type () {
 623         fetch_prune=$1
 624         remote_origin_prune=$2
 625         fetch_prune_tags=$3
 626         remote_origin_prune_tags=$4
 627         expected_branch=$5
 628         expected_tag=$6
 629         cmdline=$7
 630         mode=$8
 631
 632         if test -z "$cmdline_setup"
 633         then
 634                 test_expect_success 'setup cmdline_setup variable for subsequent test' '
 635                         remote_url="file://$(git -C one config remote.origin.url)" &&
 636                         remote_fetch="$(git -C one config remote.origin.fetch)" &&
 637                         cmdline_setup="\"$remote_url\" \"$remote_fetch\""
 638                 '
 639         fi
 640
 641         if test "$mode" = 'link'
 642         then
 643                 new_cmdline=""
 644
 645                 if test "$cmdline" = ""
 646                 then
 647                         new_cmdline=$cmdline_setup
 648                 else
 649                         new_cmdline=$(printf "%s" "$cmdline" | perl -pe 's[origin(?!/)]["'"$remote_url"'"]g')
 650                 fi
 651
 652                 if test "$fetch_prune_tags" = 'true' ||
 653                    test "$remote_origin_prune_tags" = 'true'
 654                 then
 655                         if ! printf '%s' "$cmdline\n" | grep -q refs/remotes/origin/
 656                         then
 657                                 new_cmdline="$new_cmdline refs/tags/*:refs/tags/*"
 658                         fi
 659                 fi
 660
 661                 cmdline="$new_cmdline"
 662         fi
 663
 664         test_expect_success "$mode prune fetch.prune=$1 remote.origin.prune=$2 fetch.pruneTags=$3 remote.origin.pruneTags=$4${7:+ $7}; branch:$5 tag:$6" '
 665                 # make sure a newbranch is there in . and also in one
 666                 git branch -f newbranch &&
 667                 git tag -f newtag &&
 668                 (
 669                         cd one &&
 670                         test_unconfig fetch.prune &&
 671                         test_unconfig fetch.pruneTags &&
 672                         test_unconfig remote.origin.prune &&
 673                         test_unconfig remote.origin.pruneTags &&
 674                         git fetch '"$cmdline_setup"' &&
 675                         git rev-parse --verify refs/remotes/origin/newbranch &&
 676                         git rev-parse --verify refs/tags/newtag
 677                 ) &&
 678
 679                 # now remove them
 680                 git branch -d newbranch &&
 681                 git tag -d newtag &&
 682
 683                 # then test
 684                 (
 685                         cd one &&
 686                         git_fetch_c="" &&
 687                         set_config_tristate fetch.prune $fetch_prune &&
 688                         set_config_tristate fetch.pruneTags $fetch_prune_tags &&
 689                         set_config_tristate remote.origin.prune $remote_origin_prune &&
 690                         set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 691
 692                         if test "$mode" != "link"
 693                         then
 694                                 git_fetch_c=""
 695                         fi &&
 696                         git$git_fetch_c fetch '"$cmdline"' &&
 697                         case "$expected_branch" in
 698                         pruned)
 699                                 test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
 700                                 ;;
 701                         kept)
 702                                 git rev-parse --verify refs/remotes/origin/newbranch
 703                                 ;;
 704                         esac &&
 705                         case "$expected_tag" in
 706                         pruned)
 707                                 test_must_fail git rev-parse --verify refs/tags/newtag
 708                                 ;;
 709                         kept)
 710                                 git rev-parse --verify refs/tags/newtag
 711                                 ;;
 712                         esac
 713                 )
 714         '
 715 }
 716
 717 # $1 config: fetch.prune
 718 # $2 config: remote.<name>.prune
 719 # $3 config: fetch.pruneTags
 720 # $4 config: remote.<name>.pruneTags
 721 # $5 expect: branch to be pruned?
 722 # $6 expect: tag to be pruned?
 723 # $7 git-fetch $cmdline:
 724 #
 725 #                     $1    $2    $3    $4    $5     $6     $7
 726 test_configured_prune unset unset unset unset kept   kept   ""
 727 test_configured_prune unset unset unset unset kept   kept   "--no-prune"
 728 test_configured_prune unset unset unset unset pruned kept   "--prune"
 729 test_configured_prune unset unset unset unset kept   pruned \
 730         "--prune origin refs/tags/*:refs/tags/*"
 731 test_configured_prune unset unset unset unset pruned pruned \
 732         "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
 733
 734 test_configured_prune false unset unset unset kept   kept   ""
 735 test_configured_prune false unset unset unset kept   kept   "--no-prune"
 736 test_configured_prune false unset unset unset pruned kept   "--prune"
 737
 738 test_configured_prune true  unset unset unset pruned kept   ""
 739 test_configured_prune true  unset unset unset pruned kept   "--prune"
 740 test_configured_prune true  unset unset unset kept   kept   "--no-prune"
 741
 742 test_configured_prune unset false unset unset kept   kept   ""
 743 test_configured_prune unset false unset unset kept   kept   "--no-prune"
 744 test_configured_prune unset false unset unset pruned kept   "--prune"
 745
 746 test_configured_prune false false unset unset kept   kept   ""
 747 test_configured_prune false false unset unset kept   kept   "--no-prune"
 748 test_configured_prune false false unset unset pruned kept   "--prune"
 749 test_configured_prune false false unset unset kept   pruned \
 750         "--prune origin refs/tags/*:refs/tags/*"
 751 test_configured_prune false false unset unset pruned pruned \
 752         "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
 753
 754 test_configured_prune true  false unset unset kept   kept   ""
 755 test_configured_prune true  false unset unset pruned kept   "--prune"
 756 test_configured_prune true  false unset unset kept   kept   "--no-prune"
 757
 758 test_configured_prune unset true  unset unset pruned kept   ""
 759 test_configured_prune unset true  unset unset kept   kept   "--no-prune"
 760 test_configured_prune unset true  unset unset pruned kept   "--prune"
 761
 762 test_configured_prune false true  unset unset pruned kept   ""
 763 test_configured_prune false true  unset unset kept   kept   "--no-prune"
 764 test_configured_prune false true  unset unset pruned kept   "--prune"
 765
 766 test_configured_prune true  true  unset unset pruned kept   ""
 767 test_configured_prune true  true  unset unset pruned kept   "--prune"
 768 test_configured_prune true  true  unset unset kept   kept   "--no-prune"
 769 test_configured_prune true  true  unset unset kept   pruned \
 770         "--prune origin refs/tags/*:refs/tags/*"
 771 test_configured_prune true  true  unset unset pruned pruned \
 772         "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
 773
 774 # --prune-tags on its own does nothing, needs --prune as well, same
 775 # for for fetch.pruneTags without fetch.prune
 776 test_configured_prune unset unset unset unset kept kept     "--prune-tags"
 777 test_configured_prune unset unset true unset  kept kept     ""
 778 test_configured_prune unset unset unset true  kept kept     ""
 779
 780 # These will prune the tags
 781 test_configured_prune unset unset unset unset pruned pruned "--prune --prune-tags"
 782 test_configured_prune true  unset true  unset pruned pruned ""
 783 test_configured_prune unset true  unset true  pruned pruned ""
 784
 785 # remote.<name>.pruneTags overrides fetch.pruneTags, just like
 786 # remote.<name>.prune overrides fetch.prune if set.
 787 test_configured_prune true  unset true unset pruned pruned  ""
 788 test_configured_prune false true  false true  pruned pruned ""
 789 test_configured_prune true  false true  false kept   kept   ""
 790
 791 # When --prune-tags is supplied it's ignored if an explicit refspec is
 792 # given, same for the configuration options.
 793 test_configured_prune unset unset unset unset pruned kept \
 794         "--prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*"
 795 test_configured_prune unset unset true  unset pruned kept \
 796         "--prune origin +refs/heads/*:refs/remotes/origin/*"
 797 test_configured_prune unset unset unset true pruned  kept \
 798         "--prune origin +refs/heads/*:refs/remotes/origin/*"
 799
 800 # Pruning that also takes place if a file:// url replaces a named
 801 # remote. However, because there's no implicit
 802 # +refs/heads/*:refs/remotes/origin/* refspec and supplying it on the
 803 # command-line negates --prune-tags, the branches will not be pruned.
 804 test_configured_prune_type unset unset unset unset kept   kept   "origin --prune-tags" "name"
 805 test_configured_prune_type unset unset unset unset kept   kept   "origin --prune-tags" "link"
 806 test_configured_prune_type unset unset unset unset pruned pruned "origin --prune --prune-tags" "name"
 807 test_configured_prune_type unset unset unset unset kept   pruned "origin --prune --prune-tags" "link"
 808 test_configured_prune_type unset unset unset unset pruned pruned "--prune --prune-tags origin" "name"
 809 test_configured_prune_type unset unset unset unset kept   pruned "--prune --prune-tags origin" "link"
 810 test_configured_prune_type unset unset true  unset pruned pruned "--prune origin" "name"
 811 test_configured_prune_type unset unset true  unset kept   pruned "--prune origin" "link"
 812 test_configured_prune_type unset unset unset true  pruned pruned "--prune origin" "name"
 813 test_configured_prune_type unset unset unset true  kept   pruned "--prune origin" "link"
 814 test_configured_prune_type true  unset true  unset pruned pruned "origin" "name"
 815 test_configured_prune_type true  unset true  unset kept   pruned "origin" "link"
 816 test_configured_prune_type unset  true true  unset pruned pruned "origin" "name"
 817 test_configured_prune_type unset  true true  unset kept   pruned "origin" "link"
 818 test_configured_prune_type unset  true unset true  pruned pruned "origin" "name"
 819 test_configured_prune_type unset  true unset true  kept   pruned "origin" "link"
 820
 821 # When all remote.origin.fetch settings are deleted a --prune
 822 # --prune-tags still implicitly supplies refs/tags/*:refs/tags/* so
 823 # tags, but not tracking branches, will be deleted.
 824 test_expect_success 'remove remote.origin.fetch "one"' '
 825         (
 826                 cd one &&
 827                 git config --unset-all remote.origin.fetch
 828         )
 829 '
 830 test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "name"
 831 test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link"
 832
 833 test_expect_success 'all boundary commits are excluded' '
 834         test_commit base &&
 835         test_commit oneside &&
 836         git checkout HEAD^ &&
 837         test_commit otherside &&
 838         git checkout master &&
 839         test_tick &&
 840         git merge otherside &&
 841         ad=$(git log --no-walk --format=%ad HEAD) &&
 842         git bundle create twoside-boundary.bdl master --since="$ad" &&
 843         convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
 844         pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
 845         test_bundle_object_count .git/objects/pack/pack-${pack##pack    }.pack 3
 846 '
 847
 848 test_expect_success 'fetch --prune prints the remotes url' '
 849         git branch goodbye &&
 850         git clone . only-prunes &&
 851         git branch -D goodbye &&
 852         (
 853                 cd only-prunes &&
 854                 git fetch --prune origin 2>&1 | head -n1 >../actual
 855         ) &&
 856         echo "From ${D}/." >expect &&
 857         test_i18ncmp expect actual
 858 '
 859
 860 test_expect_success 'branchname D/F conflict resolved by --prune' '
 861         git branch dir/file &&
 862         git clone . prune-df-conflict &&
 863         git branch -D dir/file &&
 864         git branch dir &&
 865         (
 866                 cd prune-df-conflict &&
 867                 git fetch --prune &&
 868                 git rev-parse origin/dir >../actual
 869         ) &&
 870         git rev-parse dir >expect &&
 871         test_cmp expect actual
 872 '
 873
 874 test_expect_success 'fetching a one-level ref works' '
 875         test_commit extra &&
 876         git reset --hard HEAD^ &&
 877         git update-ref refs/foo extra &&
 878         git init one-level &&
 879         (
 880                 cd one-level &&
 881                 git fetch .. HEAD refs/foo
 882         )
 883 '
 884
 885 test_expect_success 'fetching with auto-gc does not lock up' '
 886         write_script askyesno <<-\EOF &&
 887         echo "$*" &&
 888         false
 889         EOF
 890         git clone "file://$D" auto-gc &&
 891         test_commit test2 &&
 892         (
 893                 cd auto-gc &&
 894                 git config fetch.unpackLimit 1 &&
 895                 git config gc.autoPackLimit 1 &&
 896                 git config gc.autoDetach false &&
 897                 GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
 898                 test_i18ngrep "Auto packing the repository" fetch.out &&
 899                 ! grep "Should I try again" fetch.out
 900         )
 901 '
 902
 903 test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
 904         git clone . full-output &&
 905         test_commit looooooooooooong-tag &&
 906         (
 907                 cd full-output &&
 908                 git -c fetch.output=full fetch origin >actual 2>&1 &&
 909                 grep -e "->" actual | cut -c 22- >../actual
 910         ) &&
 911         cat >expect <<-\EOF &&
 912         master               -> origin/master
 913         looooooooooooong-tag -> looooooooooooong-tag
 914         EOF
 915         test_cmp expect actual
 916 '
 917
 918 test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
 919         git clone . compact &&
 920         test_commit extraaa &&
 921         (
 922                 cd compact &&
 923                 git -c fetch.output=compact fetch origin >actual 2>&1 &&
 924                 grep -e "->" actual | cut -c 22- >../actual
 925         ) &&
 926         cat >expect <<-\EOF &&
 927         master     -> origin/*
 928         extraaa    -> *
 929         EOF
 930         test_cmp expect actual
 931 '
 932
 933 test_expect_success '--no-show-forced-updates' '
 934         mkdir forced-updates &&
 935         (
 936                 cd forced-updates &&
 937                 git init &&
 938                 test_commit 1 &&
 939                 test_commit 2
 940         ) &&
 941         git clone forced-updates forced-update-clone &&
 942         git clone forced-updates no-forced-update-clone &&
 943         git -C forced-updates reset --hard HEAD~1 &&
 944         (
 945                 cd forced-update-clone &&
 946                 git fetch --show-forced-updates origin 2>output &&
 947                 test_i18ngrep "(forced update)" output
 948         ) &&
 949         (
 950                 cd no-forced-update-clone &&
 951                 git fetch --no-show-forced-updates origin 2>output &&
 952                 test_i18ngrep ! "(forced update)" output
 953         )
 954 '
 955
 956 setup_negotiation_tip () {
 957         SERVER="$1"
 958         URL="$2"
 959         USE_PROTOCOL_V2="$3"
 960
 961         rm -rf "$SERVER" client trace &&
 962         git init "$SERVER" &&
 963         test_commit -C "$SERVER" alpha_1 &&
 964         test_commit -C "$SERVER" alpha_2 &&
 965         git -C "$SERVER" checkout --orphan beta &&
 966         test_commit -C "$SERVER" beta_1 &&
 967         test_commit -C "$SERVER" beta_2 &&
 968
 969         git clone "$URL" client &&
 970
 971         if test "$USE_PROTOCOL_V2" -eq 1
 972         then
 973                 git -C "$SERVER" config protocol.version 2 &&
 974                 git -C client config protocol.version 2
 975         fi &&
 976
 977         test_commit -C "$SERVER" beta_s &&
 978         git -C "$SERVER" checkout master &&
 979         test_commit -C "$SERVER" alpha_s &&
 980         git -C "$SERVER" tag -d alpha_1 alpha_2 beta_1 beta_2
 981 }
 982
 983 check_negotiation_tip () {
 984         # Ensure that {alpha,beta}_1 are sent as "have", but not {alpha_beta}_2
 985         ALPHA_1=$(git -C client rev-parse alpha_1) &&
 986         grep "fetch> have $ALPHA_1" trace &&
 987         BETA_1=$(git -C client rev-parse beta_1) &&
 988         grep "fetch> have $BETA_1" trace &&
 989         ALPHA_2=$(git -C client rev-parse alpha_2) &&
 990         ! grep "fetch> have $ALPHA_2" trace &&
 991         BETA_2=$(git -C client rev-parse beta_2) &&
 992         ! grep "fetch> have $BETA_2" trace
 993 }
 994
 995 test_expect_success '--negotiation-tip limits "have" lines sent' '
 996         setup_negotiation_tip server server 0 &&
 997         GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
 998                 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
 999                 origin alpha_s beta_s &&
1000         check_negotiation_tip
1001 '
1002
1003 test_expect_success '--negotiation-tip understands globs' '
1004         setup_negotiation_tip server server 0 &&
1005         GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1006                 --negotiation-tip=*_1 \
1007                 origin alpha_s beta_s &&
1008         check_negotiation_tip
1009 '
1010
1011 test_expect_success '--negotiation-tip understands abbreviated SHA-1' '
1012         setup_negotiation_tip server server 0 &&
1013         GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1014                 --negotiation-tip=$(git -C client rev-parse --short alpha_1) \
1015                 --negotiation-tip=$(git -C client rev-parse --short beta_1) \
1016                 origin alpha_s beta_s &&
1017         check_negotiation_tip
1018 '
1019
1020 . "$TEST_DIRECTORY"/lib-httpd.sh
1021 start_httpd
1022
1023 test_expect_success '--negotiation-tip limits "have" lines sent with HTTP protocol v2' '
1024         setup_negotiation_tip "$HTTPD_DOCUMENT_ROOT_PATH/server" \
1025                 "$HTTPD_URL/smart/server" 1 &&
1026         GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1027                 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
1028                 origin alpha_s beta_s &&
1029         check_negotiation_tip
1030 '
1031
1032 # DO NOT add non-httpd-specific tests here, because the last part of this
1033 # test script is only executed when httpd is available and enabled.
1034
1035 test_done