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         test -f .git/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         test -f .git/refs/heads/two &&
  77         test -f .git/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                 grep " -> refs/crazyheads/descriptive-branch$" actual |
 226                 test_i18ngrep "new branch" &&
 227                 grep " -> descriptive-tag$" actual |
 228                 test_i18ngrep "new tag" &&
 229                 grep " -> crazy$" actual |
 230                 test_i18ngrep "new ref"
 231         ) &&
 232         git checkout master
 233 '
 234
 235 test_expect_success 'fetch must not resolve short tag name' '
 236
 237         cd "$D" &&
 238
 239         mkdir five &&
 240         cd five &&
 241         git init &&
 242
 243         test_must_fail git fetch .. anno:five
 244
 245 '
 246
 247 test_expect_success 'fetch can now resolve short remote name' '
 248
 249         cd "$D" &&
 250         git update-ref refs/remotes/six/HEAD HEAD &&
 251
 252         mkdir six &&
 253         cd six &&
 254         git init &&
 255
 256         git fetch .. six:six
 257 '
 258
 259 test_expect_success 'create bundle 1' '
 260         cd "$D" &&
 261         echo >file updated again by origin &&
 262         git commit -a -m "tip" &&
 263         git bundle create bundle1 master^..master
 264 '
 265
 266 test_expect_success 'header of bundle looks right' '
 267         head -n 1 "$D"/bundle1 | grep "^#" &&
 268         head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " &&
 269         head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " &&
 270         head -n 4 "$D"/bundle1 | grep "^$"
 271 '
 272
 273 test_expect_success 'create bundle 2' '
 274         cd "$D" &&
 275         git bundle create bundle2 master~2..master
 276 '
 277
 278 test_expect_success 'unbundle 1' '
 279         cd "$D/bundle" &&
 280         git checkout -b some-branch &&
 281         test_must_fail git fetch "$D/bundle1" master:master
 282 '
 283
 284
 285 test_expect_success 'bundle 1 has only 3 files ' '
 286         cd "$D" &&
 287         convert_bundle_to_pack <bundle1 >bundle.pack &&
 288         git index-pack bundle.pack &&
 289         test_bundle_object_count bundle.pack 3
 290 '
 291
 292 test_expect_success 'unbundle 2' '
 293         cd "$D/bundle" &&
 294         git fetch ../bundle2 master:master &&
 295         test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)"
 296 '
 297
 298 test_expect_success 'bundle does not prerequisite objects' '
 299         cd "$D" &&
 300         touch file2 &&
 301         git add file2 &&
 302         git commit -m add.file2 file2 &&
 303         git bundle create bundle3 -1 HEAD &&
 304         convert_bundle_to_pack <bundle3 >bundle.pack &&
 305         git index-pack bundle.pack &&
 306         test_bundle_object_count bundle.pack 3
 307 '
 308
 309 test_expect_success 'bundle should be able to create a full history' '
 310
 311         cd "$D" &&
 312         git tag -a -m '1.0' v1.0 master &&
 313         git bundle create bundle4 v1.0
 314
 315 '
 316
 317 test_expect_success 'fetch with a non-applying branch.<name>.merge' '
 318         git config branch.master.remote yeti &&
 319         git config branch.master.merge refs/heads/bigfoot &&
 320         git config remote.blub.url one &&
 321         git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
 322         git fetch blub
 323 '
 324
 325 # URL supplied to fetch does not match the url of the configured branch's remote
 326 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
 327         one_head=$(cd one && git rev-parse HEAD) &&
 328         this_head=$(git rev-parse HEAD) &&
 329         git update-ref -d FETCH_HEAD &&
 330         git fetch one &&
 331         test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
 332         test $this_head = "$(git rev-parse --verify HEAD)"
 333 '
 334
 335 # URL supplied to fetch matches the url of the configured branch's remote and
 336 # the merge spec matches the branch the remote HEAD points to
 337 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
 338         one_ref=$(cd one && git symbolic-ref HEAD) &&
 339         git config branch.master.remote blub &&
 340         git config branch.master.merge "$one_ref" &&
 341         git update-ref -d FETCH_HEAD &&
 342         git fetch one &&
 343         test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
 344         test $this_head = "$(git rev-parse --verify HEAD)"
 345 '
 346
 347 # URL supplied to fetch matches the url of the configured branch's remote, but
 348 # the merge spec does not match the branch the remote HEAD points to
 349 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
 350         git config branch.master.merge "${one_ref}_not" &&
 351         git update-ref -d FETCH_HEAD &&
 352         git fetch one &&
 353         test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
 354         test $this_head = "$(git rev-parse --verify HEAD)"
 355 '
 356
 357 # the strange name is: a\!'b
 358 test_expect_success 'quoting of a strangely named repo' '
 359         test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
 360         cat result &&
 361         grep "fatal: '\''a\\\\!'\''b'\''" result
 362 '
 363
 364 test_expect_success 'bundle should record HEAD correctly' '
 365
 366         cd "$D" &&
 367         git bundle create bundle5 HEAD master &&
 368         git bundle list-heads bundle5 >actual &&
 369         for h in HEAD refs/heads/master
 370         do
 371                 echo "$(git rev-parse --verify $h) $h"
 372         done >expect &&
 373         test_cmp expect actual
 374
 375 '
 376
 377 test_expect_success 'mark initial state of origin/master' '
 378         (
 379                 cd three &&
 380                 git tag base-origin-master refs/remotes/origin/master
 381         )
 382 '
 383
 384 test_expect_success 'explicit fetch should update tracking' '
 385
 386         cd "$D" &&
 387         git branch -f side &&
 388         (
 389                 cd three &&
 390                 git update-ref refs/remotes/origin/master base-origin-master &&
 391                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 392                 git fetch origin master &&
 393                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 394                 test "$o" != "$n" &&
 395                 test_must_fail git rev-parse --verify refs/remotes/origin/side
 396         )
 397 '
 398
 399 test_expect_success 'explicit pull should update tracking' '
 400
 401         cd "$D" &&
 402         git branch -f side &&
 403         (
 404                 cd three &&
 405                 git update-ref refs/remotes/origin/master base-origin-master &&
 406                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 407                 git pull origin master &&
 408                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 409                 test "$o" != "$n" &&
 410                 test_must_fail git rev-parse --verify refs/remotes/origin/side
 411         )
 412 '
 413
 414 test_expect_success 'explicit --refmap is allowed only with command-line refspec' '
 415         cd "$D" &&
 416         (
 417                 cd three &&
 418                 test_must_fail git fetch --refmap="*:refs/remotes/none/*"
 419         )
 420 '
 421
 422 test_expect_success 'explicit --refmap option overrides remote.*.fetch' '
 423         cd "$D" &&
 424         git branch -f side &&
 425         (
 426                 cd three &&
 427                 git update-ref refs/remotes/origin/master base-origin-master &&
 428                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 429                 git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin master &&
 430                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 431                 test "$o" = "$n" &&
 432                 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
 433                 git rev-parse --verify refs/remotes/other/master
 434         )
 435 '
 436
 437 test_expect_success 'explicitly empty --refmap option disables remote.*.fetch' '
 438         cd "$D" &&
 439         git branch -f side &&
 440         (
 441                 cd three &&
 442                 git update-ref refs/remotes/origin/master base-origin-master &&
 443                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 444                 git fetch --refmap="" origin master &&
 445                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 446                 test "$o" = "$n" &&
 447                 test_must_fail git rev-parse --verify refs/remotes/origin/side
 448         )
 449 '
 450
 451 test_expect_success 'configured fetch updates tracking' '
 452
 453         cd "$D" &&
 454         git branch -f side &&
 455         (
 456                 cd three &&
 457                 git update-ref refs/remotes/origin/master base-origin-master &&
 458                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 459                 git fetch origin &&
 460                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 461                 test "$o" != "$n" &&
 462                 git rev-parse --verify refs/remotes/origin/side
 463         )
 464 '
 465
 466 test_expect_success 'non-matching refspecs do not confuse tracking update' '
 467         cd "$D" &&
 468         git update-ref refs/odd/location HEAD &&
 469         (
 470                 cd three &&
 471                 git update-ref refs/remotes/origin/master base-origin-master &&
 472                 git config --add remote.origin.fetch \
 473                         refs/odd/location:refs/remotes/origin/odd &&
 474                 o=$(git rev-parse --verify refs/remotes/origin/master) &&
 475                 git fetch origin master &&
 476                 n=$(git rev-parse --verify refs/remotes/origin/master) &&
 477                 test "$o" != "$n" &&
 478                 test_must_fail git rev-parse --verify refs/remotes/origin/odd
 479         )
 480 '
 481
 482 test_expect_success 'pushing nonexistent branch by mistake should not segv' '
 483
 484         cd "$D" &&
 485         test_must_fail git push seven no:no
 486
 487 '
 488
 489 test_expect_success 'auto tag following fetches minimum' '
 490
 491         cd "$D" &&
 492         git clone .git follow &&
 493         git checkout HEAD^0 &&
 494         (
 495                 for i in 1 2 3 4 5 6 7
 496                 do
 497                         echo $i >>file &&
 498                         git commit -m $i -a &&
 499                         git tag -a -m $i excess-$i || exit 1
 500                 done
 501         ) &&
 502         git checkout master &&
 503         (
 504                 cd follow &&
 505                 git fetch
 506         )
 507 '
 508
 509 test_expect_success 'refuse to fetch into the current branch' '
 510
 511         test_must_fail git fetch . side:master
 512
 513 '
 514
 515 test_expect_success 'fetch into the current branch with --update-head-ok' '
 516
 517         git fetch --update-head-ok . side:master
 518
 519 '
 520
 521 test_expect_success 'fetch --dry-run' '
 522
 523         rm -f .git/FETCH_HEAD &&
 524         git fetch --dry-run . &&
 525         ! test -f .git/FETCH_HEAD
 526 '
 527
 528 test_expect_success "should be able to fetch with duplicate refspecs" '
 529         mkdir dups &&
 530         (
 531                 cd dups &&
 532                 git init &&
 533                 git config branch.master.remote three &&
 534                 git config remote.three.url ../three/.git &&
 535                 git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
 536                 git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
 537                 git fetch three
 538         )
 539 '
 540
 541 # configured prune tests
 542
 543 set_config_tristate () {
 544         # var=$1 val=$2
 545         case "$2" in
 546         unset)  test_unconfig "$1" ;;
 547         *)      git config "$1" "$2" ;;
 548         esac
 549 }
 550
 551 test_configured_prune () {
 552         fetch_prune=$1
 553         remote_origin_prune=$2
 554         expected_branch=$3
 555         expected_tag=$4
 556         cmdline=$5
 557
 558         test_expect_success "prune fetch.prune=$1 remote.origin.prune=$2${5:+ $5}; branch:$3 tag:$4" '
 559                 # make sure a newbranch is there in . and also in one
 560                 git branch -f newbranch &&
 561                 git tag -f newtag &&
 562                 (
 563                         cd one &&
 564                         test_unconfig fetch.prune &&
 565                         test_unconfig remote.origin.prune &&
 566                         git fetch &&
 567                         git rev-parse --verify refs/remotes/origin/newbranch &&
 568                         git rev-parse --verify refs/tags/newtag
 569                 ) &&
 570
 571                 # now remove it
 572                 git branch -d newbranch &&
 573                 git tag -d newtag &&
 574
 575                 # then test
 576                 (
 577                         cd one &&
 578                         set_config_tristate fetch.prune $fetch_prune &&
 579                         set_config_tristate remote.origin.prune $remote_origin_prune &&
 580
 581                         git fetch $cmdline &&
 582                         case "$expected_branch" in
 583                         pruned)
 584                                 test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
 585                                 ;;
 586                         kept)
 587                                 git rev-parse --verify refs/remotes/origin/newbranch
 588                                 ;;
 589                         esac &&
 590                         case "$expected_tag" in
 591                         pruned)
 592                                 test_must_fail git rev-parse --verify refs/tags/newtag
 593                                 ;;
 594                         kept)
 595                                 git rev-parse --verify refs/tags/newtag
 596                                 ;;
 597                         esac
 598                 )
 599         '
 600 }
 601
 602 # $1 config: fetch.prune
 603 # $2 config: remote.<name>.prune
 604 # $3 expect: branch to be pruned?
 605 # $4 expect: tag to be pruned?
 606 # $5 git-fetch $cmdline:
 607 #
 608 #                     $1    $2    $3     $4     $5
 609 test_configured_prune unset unset kept   kept   ""
 610 test_configured_prune unset unset kept   kept   "--no-prune"
 611 test_configured_prune unset unset pruned kept   "--prune"
 612 test_configured_prune unset unset kept   pruned \
 613         "--prune origin refs/tags/*:refs/tags/*"
 614 test_configured_prune unset unset pruned pruned \
 615         "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
 616
 617 test_configured_prune false unset kept   kept   ""
 618 test_configured_prune false unset kept   kept   "--no-prune"
 619 test_configured_prune false unset pruned kept   "--prune"
 620
 621 test_configured_prune true  unset pruned kept   ""
 622 test_configured_prune true  unset pruned kept   "--prune"
 623 test_configured_prune true  unset kept   kept   "--no-prune"
 624
 625 test_configured_prune unset false kept   kept   ""
 626 test_configured_prune unset false kept   kept   "--no-prune"
 627 test_configured_prune unset false pruned kept   "--prune"
 628
 629 test_configured_prune false false kept   kept   ""
 630 test_configured_prune false false kept   kept   "--no-prune"
 631 test_configured_prune false false pruned kept   "--prune"
 632 test_configured_prune false false kept   pruned \
 633         "--prune origin refs/tags/*:refs/tags/*"
 634 test_configured_prune false false pruned pruned \
 635         "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
 636
 637 test_configured_prune true  false kept   kept   ""
 638 test_configured_prune true  false pruned kept   "--prune"
 639 test_configured_prune true  false kept   kept   "--no-prune"
 640
 641 test_configured_prune unset true  pruned kept   ""
 642 test_configured_prune unset true  kept   kept   "--no-prune"
 643 test_configured_prune unset true  pruned kept   "--prune"
 644
 645 test_configured_prune false true  pruned kept   ""
 646 test_configured_prune false true  kept   kept   "--no-prune"
 647 test_configured_prune false true  pruned kept   "--prune"
 648
 649 test_configured_prune true  true  pruned kept   ""
 650 test_configured_prune true  true  pruned kept   "--prune"
 651 test_configured_prune true  true  kept   kept   "--no-prune"
 652 test_configured_prune true  true  kept   pruned \
 653         "--prune origin refs/tags/*:refs/tags/*"
 654 test_configured_prune true  true  pruned pruned \
 655         "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
 656
 657 test_expect_success 'all boundary commits are excluded' '
 658         test_commit base &&
 659         test_commit oneside &&
 660         git checkout HEAD^ &&
 661         test_commit otherside &&
 662         git checkout master &&
 663         test_tick &&
 664         git merge otherside &&
 665         ad=$(git log --no-walk --format=%ad HEAD) &&
 666         git bundle create twoside-boundary.bdl master --since="$ad" &&
 667         convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
 668         pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
 669         test_bundle_object_count .git/objects/pack/pack-${pack##pack    }.pack 3
 670 '
 671
 672 test_expect_success 'fetch --prune prints the remotes url' '
 673         git branch goodbye &&
 674         git clone . only-prunes &&
 675         git branch -D goodbye &&
 676         (
 677                 cd only-prunes &&
 678                 git fetch --prune origin 2>&1 | head -n1 >../actual
 679         ) &&
 680         echo "From ${D}/." >expect &&
 681         test_i18ncmp expect actual
 682 '
 683
 684 test_expect_success 'branchname D/F conflict resolved by --prune' '
 685         git branch dir/file &&
 686         git clone . prune-df-conflict &&
 687         git branch -D dir/file &&
 688         git branch dir &&
 689         (
 690                 cd prune-df-conflict &&
 691                 git fetch --prune &&
 692                 git rev-parse origin/dir >../actual
 693         ) &&
 694         git rev-parse dir >expect &&
 695         test_cmp expect actual
 696 '
 697
 698 test_expect_success 'fetching a one-level ref works' '
 699         test_commit extra &&
 700         git reset --hard HEAD^ &&
 701         git update-ref refs/foo extra &&
 702         git init one-level &&
 703         (
 704                 cd one-level &&
 705                 git fetch .. HEAD refs/foo
 706         )
 707 '
 708
 709 test_expect_success 'fetching with auto-gc does not lock up' '
 710         write_script askyesno <<-\EOF &&
 711         echo "$*" &&
 712         false
 713         EOF
 714         git clone "file://$D" auto-gc &&
 715         test_commit test2 &&
 716         (
 717                 cd auto-gc &&
 718                 git config gc.autoPackLimit 1 &&
 719                 git config gc.autoDetach false &&
 720                 GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
 721                 ! grep "Should I try again" fetch.out
 722         )
 723 '
 724
 725 test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
 726         git clone . full-output &&
 727         test_commit looooooooooooong-tag &&
 728         (
 729                 cd full-output &&
 730                 git -c fetch.output=full fetch origin 2>&1 | \
 731                         grep -e "->" | cut -c 22- >../actual
 732         ) &&
 733         cat >expect <<-\EOF &&
 734         master               -> origin/master
 735         looooooooooooong-tag -> looooooooooooong-tag
 736         EOF
 737         test_cmp expect actual
 738 '
 739
 740 test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
 741         git clone . compact &&
 742         test_commit extraaa &&
 743         (
 744                 cd compact &&
 745                 git -c fetch.output=compact fetch origin 2>&1 | \
 746                         grep -e "->" | cut -c 22- >../actual
 747         ) &&
 748         cat >expect <<-\EOF &&
 749         master     -> origin/*
 750         extraaa    -> *
 751         EOF
 752         test_cmp expect actual
 753 '
 754
 755 test_done