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         cat result &&
 358         grep "fatal: '\''a\\\\!'\''b'\''" result
 359 '
 360
 361 test_expect_success 'bundle should record HEAD correctly' '
 362
 363         cd "$D" &&
 364         git bundle create bundle5 HEAD master &&
 365         git bundle list-heads bundle5 >actual &&
 366         for h in HEAD refs/heads/master
 367         do
 368                 echo "$(git rev-parse --verify $h) $h"
 369         done >expect &&
 370         test_cmp expect actual
 371
 372 '
 373
 374 test_expect_success 'mark initial state of origin/master' '
 375         (
 376                 cd three &&
 377                 git tag base-origin-master refs/remotes/origin/master
 378         )
 379 '
 380
 381 test_expect_success 'explicit fetch should update tracking' '
 382
 383         cd "$D" &&
 384         git branch -f side &&
 385         (
 386                 cd three &&
 387                 git update-ref refs/remotes/origin/master base-origin-master &&
 388                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 389                 git fetch origin master &&
 390                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 391                 test "$o" != "$n" &&
 392                 test_must_fail git rev-parse --verify refs/remotes/origin/side
 393         )
 394 '
 395
 396 test_expect_success 'explicit pull should update tracking' '
 397
 398         cd "$D" &&
 399         git branch -f side &&
 400         (
 401                 cd three &&
 402                 git update-ref refs/remotes/origin/master base-origin-master &&
 403                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 404                 git pull origin master &&
 405                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 406                 test "$o" != "$n" &&
 407                 test_must_fail git rev-parse --verify refs/remotes/origin/side
 408         )
 409 '
 410
 411 test_expect_success 'explicit --refmap is allowed only with command-line refspec' '
 412         cd "$D" &&
 413         (
 414                 cd three &&
 415                 test_must_fail git fetch --refmap="*:refs/remotes/none/*"
 416         )
 417 '
 418
 419 test_expect_success 'explicit --refmap option overrides remote.*.fetch' '
 420         cd "$D" &&
 421         git branch -f side &&
 422         (
 423                 cd three &&
 424                 git update-ref refs/remotes/origin/master base-origin-master &&
 425                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 426                 git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin master &&
 427                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 428                 test "$o" = "$n" &&
 429                 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
 430                 git rev-parse --verify refs/remotes/other/master
 431         )
 432 '
 433
 434 test_expect_success 'explicitly empty --refmap option disables remote.*.fetch' '
 435         cd "$D" &&
 436         git branch -f side &&
 437         (
 438                 cd three &&
 439                 git update-ref refs/remotes/origin/master base-origin-master &&
 440                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 441                 git fetch --refmap="" origin master &&
 442                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 443                 test "$o" = "$n" &&
 444                 test_must_fail git rev-parse --verify refs/remotes/origin/side
 445         )
 446 '
 447
 448 test_expect_success 'configured fetch updates tracking' '
 449
 450         cd "$D" &&
 451         git branch -f side &&
 452         (
 453                 cd three &&
 454                 git update-ref refs/remotes/origin/master base-origin-master &&
 455                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 456                 git fetch origin &&
 457                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 458                 test "$o" != "$n" &&
 459                 git rev-parse --verify refs/remotes/origin/side
 460         )
 461 '
 462
 463 test_expect_success 'non-matching refspecs do not confuse tracking update' '
 464         cd "$D" &&
 465         git update-ref refs/odd/location HEAD &&
 466         (
 467                 cd three &&
 468                 git update-ref refs/remotes/origin/master base-origin-master &&
 469                 git config --add remote.origin.fetch \
 470                         refs/odd/location:refs/remotes/origin/odd &&
 471                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 472                 git fetch origin master &&
 473                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 474                 test "$o" != "$n" &&
 475                 test_must_fail git rev-parse --verify refs/remotes/origin/odd
 476         )
 477 '
 478
 479 test_expect_success 'pushing nonexistent branch by mistake should not segv' '
 480
 481         cd "$D" &&
 482         test_must_fail git push seven no:no
 483
 484 '
 485
 486 test_expect_success 'auto tag following fetches minimum' '
 487
 488         cd "$D" &&
 489         git clone .git follow &&
 490         git checkout HEAD^0 &&
 491         (
 492                 for i in 1 2 3 4 5 6 7
 493                 do
 494                         echo $i >>file &&
 495                         git commit -m $i -a &&
 496                         git tag -a -m $i excess-$i || exit 1
 497                 done
 498         ) &&
 499         git checkout master &&
 500         (
 501                 cd follow &&
 502                 git fetch
 503         )
 504 '
 505
 506 test_expect_success 'refuse to fetch into the current branch' '
 507
 508         test_must_fail git fetch . side:master
 509
 510 '
 511
 512 test_expect_success 'fetch into the current branch with --update-head-ok' '
 513
 514         git fetch --update-head-ok . side:master
 515
 516 '
 517
 518 test_expect_success 'fetch --dry-run' '
 519
 520         rm -f .git/FETCH_HEAD &&
 521         git fetch --dry-run . &&
 522         ! test -f .git/FETCH_HEAD
 523 '
 524
 525 test_expect_success "should be able to fetch with duplicate refspecs" '
 526         mkdir dups &&
 527         (
 528                 cd dups &&
 529                 git init &&
 530                 git config branch.master.remote three &&
 531                 git config remote.three.url ../three/.git &&
 532                 git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
 533                 git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
 534                 git fetch three
 535         )
 536 '
 537
 538 test_expect_success 'LHS of refspec follows ref disambiguation rules' '
 539         mkdir lhs-ambiguous &&
 540         (
 541                 cd lhs-ambiguous &&
 542                 git init server &&
 543                 test_commit -C server unwanted &&
 544                 test_commit -C server wanted &&
 545
 546                 git init client &&
 547
 548                 # Check a name coming after "refs" alphabetically ...
 549                 git -C server update-ref refs/heads/s wanted &&
 550                 git -C server update-ref refs/heads/refs/heads/s unwanted &&
 551                 git -C client fetch ../server +refs/heads/s:refs/heads/checkthis &&
 552                 git -C server rev-parse wanted >expect &&
 553                 git -C client rev-parse checkthis >actual &&
 554                 test_cmp expect actual &&
 555
 556                 # ... and one before.
 557                 git -C server update-ref refs/heads/q wanted &&
 558                 git -C server update-ref refs/heads/refs/heads/q unwanted &&
 559                 git -C client fetch ../server +refs/heads/q:refs/heads/checkthis &&
 560                 git -C server rev-parse wanted >expect &&
 561                 git -C client rev-parse checkthis >actual &&
 562                 test_cmp expect actual &&
 563
 564                 # Tags are preferred over branches like refs/{heads,tags}/*
 565                 git -C server update-ref refs/tags/t wanted &&
 566                 git -C server update-ref refs/heads/t unwanted &&
 567                 git -C client fetch ../server +t:refs/heads/checkthis &&
 568                 git -C server rev-parse wanted >expect &&
 569                 git -C client rev-parse checkthis >actual
 570         )
 571 '
 572
 573 # configured prune tests
 574
 575 set_config_tristate () {
 576         # var=$1 val=$2
 577         case "$2" in
 578         unset)
 579                 test_unconfig "$1"
 580                 ;;
 581         *)
 582                 git config "$1" "$2"
 583                 key=$(echo $1 | sed -e 's/^remote\.origin/fetch/')
 584                 git_fetch_c="$git_fetch_c -c $key=$2"
 585                 ;;
 586         esac
 587 }
 588
 589 test_configured_prune () {
 590         test_configured_prune_type "$@" "name"
 591         test_configured_prune_type "$@" "link"
 592 }
 593
 594 test_configured_prune_type () {
 595         fetch_prune=$1
 596         remote_origin_prune=$2
 597         fetch_prune_tags=$3
 598         remote_origin_prune_tags=$4
 599         expected_branch=$5
 600         expected_tag=$6
 601         cmdline=$7
 602         mode=$8
 603
 604         if test -z "$cmdline_setup"
 605         then
 606                 test_expect_success 'setup cmdline_setup variable for subsequent test' '
 607                         remote_url="file://$(git -C one config remote.origin.url)" &&
 608                         remote_fetch="$(git -C one config remote.origin.fetch)" &&
 609                         cmdline_setup="\"$remote_url\" \"$remote_fetch\""
 610                 '
 611         fi
 612
 613         if test "$mode" = 'link'
 614         then
 615                 new_cmdline=""
 616
 617                 if test "$cmdline" = ""
 618                 then
 619                         new_cmdline=$cmdline_setup
 620                 else
 621                         new_cmdline=$(printf "%s" "$cmdline" | perl -pe 's[origin(?!/)]["'"$remote_url"'"]g')
 622                 fi
 623
 624                 if test "$fetch_prune_tags" = 'true' ||
 625                    test "$remote_origin_prune_tags" = 'true'
 626                 then
 627                         if ! printf '%s' "$cmdline\n" | grep -q refs/remotes/origin/
 628                         then
 629                                 new_cmdline="$new_cmdline refs/tags/*:refs/tags/*"
 630                         fi
 631                 fi
 632
 633                 cmdline="$new_cmdline"
 634         fi
 635
 636         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" '
 637                 # make sure a newbranch is there in . and also in one
 638                 git branch -f newbranch &&
 639                 git tag -f newtag &&
 640                 (
 641                         cd one &&
 642                         test_unconfig fetch.prune &&
 643                         test_unconfig fetch.pruneTags &&
 644                         test_unconfig remote.origin.prune &&
 645                         test_unconfig remote.origin.pruneTags &&
 646                         git fetch '"$cmdline_setup"' &&
 647                         git rev-parse --verify refs/remotes/origin/newbranch &&
 648                         git rev-parse --verify refs/tags/newtag
 649                 ) &&
 650
 651                 # now remove them
 652                 git branch -d newbranch &&
 653                 git tag -d newtag &&
 654
 655                 # then test
 656                 (
 657                         cd one &&
 658                         git_fetch_c="" &&
 659                         set_config_tristate fetch.prune $fetch_prune &&
 660                         set_config_tristate fetch.pruneTags $fetch_prune_tags &&
 661                         set_config_tristate remote.origin.prune $remote_origin_prune &&
 662                         set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 663
 664                         if test "$mode" != "link"
 665                         then
 666                                 git_fetch_c=""
 667                         fi &&
 668                         git$git_fetch_c fetch '"$cmdline"' &&
 669                         case "$expected_branch" in
 670                         pruned)
 671                                 test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
 672                                 ;;
 673                         kept)
 674                                 git rev-parse --verify refs/remotes/origin/newbranch
 675                                 ;;
 676                         esac &&
 677                         case "$expected_tag" in
 678                         pruned)
 679                                 test_must_fail git rev-parse --verify refs/tags/newtag
 680                                 ;;
 681                         kept)
 682                                 git rev-parse --verify refs/tags/newtag
 683                                 ;;
 684                         esac
 685                 )
 686         '
 687 }
 688
 689 # $1 config: fetch.prune
 690 # $2 config: remote.<name>.prune
 691 # $3 config: fetch.pruneTags
 692 # $4 config: remote.<name>.pruneTags
 693 # $5 expect: branch to be pruned?
 694 # $6 expect: tag to be pruned?
 695 # $7 git-fetch $cmdline:
 696 #
 697 #                     $1    $2    $3    $4    $5     $6     $7
 698 test_configured_prune unset unset unset unset kept   kept   ""
 699 test_configured_prune unset unset unset unset kept   kept   "--no-prune"
 700 test_configured_prune unset unset unset unset pruned kept   "--prune"
 701 test_configured_prune unset unset unset unset kept   pruned \
 702         "--prune origin refs/tags/*:refs/tags/*"
 703 test_configured_prune unset unset unset unset pruned pruned \
 704         "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
 705
 706 test_configured_prune false unset unset unset kept   kept   ""
 707 test_configured_prune false unset unset unset kept   kept   "--no-prune"
 708 test_configured_prune false unset unset unset pruned kept   "--prune"
 709
 710 test_configured_prune true  unset unset unset pruned kept   ""
 711 test_configured_prune true  unset unset unset pruned kept   "--prune"
 712 test_configured_prune true  unset unset unset kept   kept   "--no-prune"
 713
 714 test_configured_prune unset false unset unset kept   kept   ""
 715 test_configured_prune unset false unset unset kept   kept   "--no-prune"
 716 test_configured_prune unset false unset unset pruned kept   "--prune"
 717
 718 test_configured_prune false false unset unset kept   kept   ""
 719 test_configured_prune false false unset unset kept   kept   "--no-prune"
 720 test_configured_prune false false unset unset pruned kept   "--prune"
 721 test_configured_prune false false unset unset kept   pruned \
 722         "--prune origin refs/tags/*:refs/tags/*"
 723 test_configured_prune false false unset unset pruned pruned \
 724         "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
 725
 726 test_configured_prune true  false unset unset kept   kept   ""
 727 test_configured_prune true  false unset unset pruned kept   "--prune"
 728 test_configured_prune true  false unset unset kept   kept   "--no-prune"
 729
 730 test_configured_prune unset true  unset unset pruned kept   ""
 731 test_configured_prune unset true  unset unset kept   kept   "--no-prune"
 732 test_configured_prune unset true  unset unset pruned kept   "--prune"
 733
 734 test_configured_prune false true  unset unset pruned kept   ""
 735 test_configured_prune false true  unset unset kept   kept   "--no-prune"
 736 test_configured_prune false true  unset unset pruned kept   "--prune"
 737
 738 test_configured_prune true  true  unset unset pruned kept   ""
 739 test_configured_prune true  true  unset unset pruned kept   "--prune"
 740 test_configured_prune true  true  unset unset kept   kept   "--no-prune"
 741 test_configured_prune true  true  unset unset kept   pruned \
 742         "--prune origin refs/tags/*:refs/tags/*"
 743 test_configured_prune true  true  unset unset pruned pruned \
 744         "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
 745
 746 # --prune-tags on its own does nothing, needs --prune as well, same
 747 # for for fetch.pruneTags without fetch.prune
 748 test_configured_prune unset unset unset unset kept kept     "--prune-tags"
 749 test_configured_prune unset unset true unset  kept kept     ""
 750 test_configured_prune unset unset unset true  kept kept     ""
 751
 752 # These will prune the tags
 753 test_configured_prune unset unset unset unset pruned pruned "--prune --prune-tags"
 754 test_configured_prune true  unset true  unset pruned pruned ""
 755 test_configured_prune unset true  unset true  pruned pruned ""
 756
 757 # remote.<name>.pruneTags overrides fetch.pruneTags, just like
 758 # remote.<name>.prune overrides fetch.prune if set.
 759 test_configured_prune true  unset true unset pruned pruned  ""
 760 test_configured_prune false true  false true  pruned pruned ""
 761 test_configured_prune true  false true  false kept   kept   ""
 762
 763 # When --prune-tags is supplied it's ignored if an explicit refspec is
 764 # given, same for the configuration options.
 765 test_configured_prune unset unset unset unset pruned kept \
 766         "--prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*"
 767 test_configured_prune unset unset true  unset pruned kept \
 768         "--prune origin +refs/heads/*:refs/remotes/origin/*"
 769 test_configured_prune unset unset unset true pruned  kept \
 770         "--prune origin +refs/heads/*:refs/remotes/origin/*"
 771
 772 # Pruning that also takes place if a file:// url replaces a named
 773 # remote. However, because there's no implicit
 774 # +refs/heads/*:refs/remotes/origin/* refspec and supplying it on the
 775 # command-line negates --prune-tags, the branches will not be pruned.
 776 test_configured_prune_type unset unset unset unset kept   kept   "origin --prune-tags" "name"
 777 test_configured_prune_type unset unset unset unset kept   kept   "origin --prune-tags" "link"
 778 test_configured_prune_type unset unset unset unset pruned pruned "origin --prune --prune-tags" "name"
 779 test_configured_prune_type unset unset unset unset kept   pruned "origin --prune --prune-tags" "link"
 780 test_configured_prune_type unset unset unset unset pruned pruned "--prune --prune-tags origin" "name"
 781 test_configured_prune_type unset unset unset unset kept   pruned "--prune --prune-tags origin" "link"
 782 test_configured_prune_type unset unset true  unset pruned pruned "--prune origin" "name"
 783 test_configured_prune_type unset unset true  unset kept   pruned "--prune origin" "link"
 784 test_configured_prune_type unset unset unset true  pruned pruned "--prune origin" "name"
 785 test_configured_prune_type unset unset unset true  kept   pruned "--prune origin" "link"
 786 test_configured_prune_type true  unset true  unset pruned pruned "origin" "name"
 787 test_configured_prune_type true  unset true  unset kept   pruned "origin" "link"
 788 test_configured_prune_type unset  true true  unset pruned pruned "origin" "name"
 789 test_configured_prune_type unset  true true  unset kept   pruned "origin" "link"
 790 test_configured_prune_type unset  true unset true  pruned pruned "origin" "name"
 791 test_configured_prune_type unset  true unset true  kept   pruned "origin" "link"
 792
 793 # When all remote.origin.fetch settings are deleted a --prune
 794 # --prune-tags still implicitly supplies refs/tags/*:refs/tags/* so
 795 # tags, but not tracking branches, will be deleted.
 796 test_expect_success 'remove remote.origin.fetch "one"' '
 797         (
 798                 cd one &&
 799                 git config --unset-all remote.origin.fetch
 800         )
 801 '
 802 test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "name"
 803 test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link"
 804
 805 test_expect_success 'all boundary commits are excluded' '
 806         test_commit base &&
 807         test_commit oneside &&
 808         git checkout HEAD^ &&
 809         test_commit otherside &&
 810         git checkout master &&
 811         test_tick &&
 812         git merge otherside &&
 813         ad=$(git log --no-walk --format=%ad HEAD) &&
 814         git bundle create twoside-boundary.bdl master --since="$ad" &&
 815         convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
 816         pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
 817         test_bundle_object_count .git/objects/pack/pack-${pack##pack    }.pack 3
 818 '
 819
 820 test_expect_success 'fetch --prune prints the remotes url' '
 821         git branch goodbye &&
 822         git clone . only-prunes &&
 823         git branch -D goodbye &&
 824         (
 825                 cd only-prunes &&
 826                 git fetch --prune origin 2>&1 | head -n1 >../actual
 827         ) &&
 828         echo "From ${D}/." >expect &&
 829         test_i18ncmp expect actual
 830 '
 831
 832 test_expect_success 'branchname D/F conflict resolved by --prune' '
 833         git branch dir/file &&
 834         git clone . prune-df-conflict &&
 835         git branch -D dir/file &&
 836         git branch dir &&
 837         (
 838                 cd prune-df-conflict &&
 839                 git fetch --prune &&
 840                 git rev-parse origin/dir >../actual
 841         ) &&
 842         git rev-parse dir >expect &&
 843         test_cmp expect actual
 844 '
 845
 846 test_expect_success 'fetching a one-level ref works' '
 847         test_commit extra &&
 848         git reset --hard HEAD^ &&
 849         git update-ref refs/foo extra &&
 850         git init one-level &&
 851         (
 852                 cd one-level &&
 853                 git fetch .. HEAD refs/foo
 854         )
 855 '
 856
 857 test_expect_success 'fetching with auto-gc does not lock up' '
 858         write_script askyesno <<-\EOF &&
 859         echo "$*" &&
 860         false
 861         EOF
 862         git clone "file://$D" auto-gc &&
 863         test_commit test2 &&
 864         (
 865                 cd auto-gc &&
 866                 git config fetch.unpackLimit 1 &&
 867                 git config gc.autoPackLimit 1 &&
 868                 git config gc.autoDetach false &&
 869                 GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
 870                 test_i18ngrep "Auto packing the repository" fetch.out &&
 871                 ! grep "Should I try again" fetch.out
 872         )
 873 '
 874
 875 test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
 876         git clone . full-output &&
 877         test_commit looooooooooooong-tag &&
 878         (
 879                 cd full-output &&
 880                 git -c fetch.output=full fetch origin >actual 2>&1 &&
 881                 grep -e "->" actual | cut -c 22- >../actual
 882         ) &&
 883         cat >expect <<-\EOF &&
 884         master               -> origin/master
 885         looooooooooooong-tag -> looooooooooooong-tag
 886         EOF
 887         test_cmp expect actual
 888 '
 889
 890 test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
 891         git clone . compact &&
 892         test_commit extraaa &&
 893         (
 894                 cd compact &&
 895                 git -c fetch.output=compact fetch origin >actual 2>&1 &&
 896                 grep -e "->" actual | cut -c 22- >../actual
 897         ) &&
 898         cat >expect <<-\EOF &&
 899         master     -> origin/*
 900         extraaa    -> *
 901         EOF
 902         test_cmp expect actual
 903 '
 904
 905 setup_negotiation_tip () {
 906         SERVER="$1"
 907         URL="$2"
 908         USE_PROTOCOL_V2="$3"
 909
 910         rm -rf "$SERVER" client trace &&
 911         git init "$SERVER" &&
 912         test_commit -C "$SERVER" alpha_1 &&
 913         test_commit -C "$SERVER" alpha_2 &&
 914         git -C "$SERVER" checkout --orphan beta &&
 915         test_commit -C "$SERVER" beta_1 &&
 916         test_commit -C "$SERVER" beta_2 &&
 917
 918         git clone "$URL" client &&
 919
 920         if test "$USE_PROTOCOL_V2" -eq 1
 921         then
 922                 git -C "$SERVER" config protocol.version 2 &&
 923                 git -C client config protocol.version 2
 924         fi &&
 925
 926         test_commit -C "$SERVER" beta_s &&
 927         git -C "$SERVER" checkout master &&
 928         test_commit -C "$SERVER" alpha_s &&
 929         git -C "$SERVER" tag -d alpha_1 alpha_2 beta_1 beta_2
 930 }
 931
 932 check_negotiation_tip () {
 933         # Ensure that {alpha,beta}_1 are sent as "have", but not {alpha_beta}_2
 934         ALPHA_1=$(git -C client rev-parse alpha_1) &&
 935         grep "fetch> have $ALPHA_1" trace &&
 936         BETA_1=$(git -C client rev-parse beta_1) &&
 937         grep "fetch> have $BETA_1" trace &&
 938         ALPHA_2=$(git -C client rev-parse alpha_2) &&
 939         ! grep "fetch> have $ALPHA_2" trace &&
 940         BETA_2=$(git -C client rev-parse beta_2) &&
 941         ! grep "fetch> have $BETA_2" trace
 942 }
 943
 944 test_expect_success '--negotiation-tip limits "have" lines sent' '
 945         setup_negotiation_tip server server 0 &&
 946         GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
 947                 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
 948                 origin alpha_s beta_s &&
 949         check_negotiation_tip
 950 '
 951
 952 test_expect_success '--negotiation-tip understands globs' '
 953         setup_negotiation_tip server server 0 &&
 954         GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
 955                 --negotiation-tip=*_1 \
 956                 origin alpha_s beta_s &&
 957         check_negotiation_tip
 958 '
 959
 960 test_expect_success '--negotiation-tip understands abbreviated SHA-1' '
 961         setup_negotiation_tip server server 0 &&
 962         GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
 963                 --negotiation-tip=$(git -C client rev-parse --short alpha_1) \
 964                 --negotiation-tip=$(git -C client rev-parse --short beta_1) \
 965                 origin alpha_s beta_s &&
 966         check_negotiation_tip
 967 '
 968
 969 . "$TEST_DIRECTORY"/lib-httpd.sh
 970 start_httpd
 971
 972 test_expect_success '--negotiation-tip limits "have" lines sent with HTTP protocol v2' '
 973         setup_negotiation_tip "$HTTPD_DOCUMENT_ROOT_PATH/server" \
 974                 "$HTTPD_URL/smart/server" 1 &&
 975         GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
 976                 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
 977                 origin alpha_s beta_s &&
 978         check_negotiation_tip
 979 '
 980
 981 test_expect_success '--no-show-forced-updates' '
 982         mkdir forced-updates &&
 983         (
 984                 cd forced-updates &&
 985                 git init &&
 986                 test_commit 1 &&
 987                 test_commit 2
 988         ) &&
 989         git clone forced-updates forced-update-clone &&
 990         git clone forced-updates no-forced-update-clone &&
 991         git -C forced-updates reset --hard HEAD~1 &&
 992         (
 993                 cd forced-update-clone &&
 994                 git fetch --show-forced-updates origin 2>output &&
 995                 test_i18ngrep "(forced update)" output
 996         ) &&
 997         (
 998                 cd no-forced-update-clone &&
 999                 git fetch --no-show-forced-updates origin 2>output &&
1000                 ! test_i18ngrep "(forced update)" output
1001         )
1002 '
1003
1004 test_done