t / t7406-submodule-update.shon commit t7406: simplify by using diff --name-only instead of diff --raw (602813c)
   1#!/bin/sh
   2#
   3# Copyright (c) 2009 Red Hat, Inc.
   4#
   5
   6test_description='Test updating submodules
   7
   8This test verifies that "git submodule update" detaches the HEAD of the
   9submodule and "git submodule update --rebase/--merge" does not detach the HEAD.
  10'
  11
  12. ./test-lib.sh
  13
  14
  15compare_head()
  16{
  17    sha_master=$(git rev-list --max-count=1 master)
  18    sha_head=$(git rev-list --max-count=1 HEAD)
  19
  20    test "$sha_master" = "$sha_head"
  21}
  22
  23
  24test_expect_success 'setup a submodule tree' '
  25        echo file > file &&
  26        git add file &&
  27        test_tick &&
  28        git commit -m upstream &&
  29        git clone . super &&
  30        git clone super submodule &&
  31        git clone super rebasing &&
  32        git clone super merging &&
  33        git clone super none &&
  34        (cd super &&
  35         git submodule add ../submodule submodule &&
  36         test_tick &&
  37         git commit -m "submodule" &&
  38         git submodule init submodule
  39        ) &&
  40        (cd submodule &&
  41        echo "line2" > file &&
  42        git add file &&
  43        git commit -m "Commit 2"
  44        ) &&
  45        (cd super &&
  46         (cd submodule &&
  47          git pull --rebase origin
  48         ) &&
  49         git add submodule &&
  50         git commit -m "submodule update"
  51        ) &&
  52        (cd super &&
  53         git submodule add ../rebasing rebasing &&
  54         test_tick &&
  55         git commit -m "rebasing"
  56        ) &&
  57        (cd super &&
  58         git submodule add ../merging merging &&
  59         test_tick &&
  60         git commit -m "rebasing"
  61        ) &&
  62        (cd super &&
  63         git submodule add ../none none &&
  64         test_tick &&
  65         git commit -m "none"
  66        ) &&
  67        git clone . recursivesuper &&
  68        ( cd recursivesuper &&
  69         git submodule add ../super super
  70        )
  71'
  72
  73test_expect_success 'submodule update detaching the HEAD ' '
  74        (cd super/submodule &&
  75         git reset --hard HEAD~1
  76        ) &&
  77        (cd super &&
  78         (cd submodule &&
  79          compare_head
  80         ) &&
  81         git submodule update submodule &&
  82         cd submodule &&
  83         ! compare_head
  84        )
  85'
  86
  87test_expect_success 'submodule update from subdirectory' '
  88        (cd super/submodule &&
  89         git reset --hard HEAD~1
  90        ) &&
  91        mkdir super/sub &&
  92        (cd super/sub &&
  93         (cd ../submodule &&
  94          compare_head
  95         ) &&
  96         git submodule update ../submodule &&
  97         cd ../submodule &&
  98         ! compare_head
  99        )
 100'
 101
 102supersha1=$(git -C super rev-parse HEAD)
 103mergingsha1=$(git -C super/merging rev-parse HEAD)
 104nonesha1=$(git -C super/none rev-parse HEAD)
 105rebasingsha1=$(git -C super/rebasing rev-parse HEAD)
 106submodulesha1=$(git -C super/submodule rev-parse HEAD)
 107pwd=$(pwd)
 108
 109cat <<EOF >expect
 110Submodule path '../super': checked out '$supersha1'
 111Submodule path '../super/merging': checked out '$mergingsha1'
 112Submodule path '../super/none': checked out '$nonesha1'
 113Submodule path '../super/rebasing': checked out '$rebasingsha1'
 114Submodule path '../super/submodule': checked out '$submodulesha1'
 115EOF
 116
 117cat <<EOF >expect2
 118Submodule 'merging' ($pwd/merging) registered for path '../super/merging'
 119Submodule 'none' ($pwd/none) registered for path '../super/none'
 120Submodule 'rebasing' ($pwd/rebasing) registered for path '../super/rebasing'
 121Submodule 'submodule' ($pwd/submodule) registered for path '../super/submodule'
 122Cloning into '$pwd/recursivesuper/super/merging'...
 123done.
 124Cloning into '$pwd/recursivesuper/super/none'...
 125done.
 126Cloning into '$pwd/recursivesuper/super/rebasing'...
 127done.
 128Cloning into '$pwd/recursivesuper/super/submodule'...
 129done.
 130EOF
 131
 132test_expect_success 'submodule update --init --recursive from subdirectory' '
 133        git -C recursivesuper/super reset --hard HEAD^ &&
 134        (cd recursivesuper &&
 135         mkdir tmp &&
 136         cd tmp &&
 137         git submodule update --init --recursive ../super >../../actual 2>../../actual2
 138        ) &&
 139        test_i18ncmp expect actual &&
 140        test_i18ncmp expect2 actual2
 141'
 142
 143cat <<EOF >expect2
 144Submodule 'foo/sub' ($pwd/withsubs/../rebasing) registered for path 'sub'
 145EOF
 146
 147test_expect_success 'submodule update --init from and of subdirectory' '
 148        git init withsubs &&
 149        (cd withsubs &&
 150         mkdir foo &&
 151         git submodule add "$(pwd)/../rebasing" foo/sub &&
 152         (cd foo &&
 153          git submodule deinit -f sub &&
 154          git submodule update --init sub 2>../../actual2
 155         )
 156        ) &&
 157        test_i18ncmp expect2 actual2
 158'
 159
 160apos="'";
 161test_expect_success 'submodule update does not fetch already present commits' '
 162        (cd submodule &&
 163          echo line3 >> file &&
 164          git add file &&
 165          test_tick &&
 166          git commit -m "upstream line3"
 167        ) &&
 168        (cd super/submodule &&
 169          head=$(git rev-parse --verify HEAD) &&
 170          echo "Submodule path ${apos}submodule$apos: checked out $apos$head$apos" > ../../expected &&
 171          git reset --hard HEAD~1
 172        ) &&
 173        (cd super &&
 174          git submodule update > ../actual 2> ../actual.err
 175        ) &&
 176        test_i18ncmp expected actual &&
 177        ! test -s actual.err
 178'
 179
 180test_expect_success 'submodule update should fail due to local changes' '
 181        (cd super/submodule &&
 182         git reset --hard HEAD~1 &&
 183         echo "local change" > file
 184        ) &&
 185        (cd super &&
 186         (cd submodule &&
 187          compare_head
 188         ) &&
 189         test_must_fail git submodule update submodule
 190        )
 191'
 192test_expect_success 'submodule update should throw away changes with --force ' '
 193        (cd super &&
 194         (cd submodule &&
 195          compare_head
 196         ) &&
 197         git submodule update --force submodule &&
 198         cd submodule &&
 199         ! compare_head
 200        )
 201'
 202
 203test_expect_success 'submodule update --force forcibly checks out submodules' '
 204        (cd super &&
 205         (cd submodule &&
 206          rm -f file
 207         ) &&
 208         git submodule update --force submodule &&
 209         (cd submodule &&
 210          test "$(git status -s file)" = ""
 211         )
 212        )
 213'
 214
 215test_expect_success 'submodule update --remote should fetch upstream changes' '
 216        (cd submodule &&
 217         echo line4 >> file &&
 218         git add file &&
 219         test_tick &&
 220         git commit -m "upstream line4"
 221        ) &&
 222        (cd super &&
 223         git submodule update --remote --force submodule &&
 224         cd submodule &&
 225         test "$(git log -1 --oneline)" = "$(GIT_DIR=../../submodule/.git git log -1 --oneline)"
 226        )
 227'
 228
 229test_expect_success 'submodule update --remote should fetch upstream changes with .' '
 230        (
 231                cd super &&
 232                git config -f .gitmodules submodule."submodule".branch "." &&
 233                git add .gitmodules &&
 234                git commit -m "submodules: update from the respective superproject branch"
 235        ) &&
 236        (
 237                cd submodule &&
 238                echo line4a >> file &&
 239                git add file &&
 240                test_tick &&
 241                git commit -m "upstream line4a" &&
 242                git checkout -b test-branch &&
 243                test_commit on-test-branch
 244        ) &&
 245        (
 246                cd super &&
 247                git submodule update --remote --force submodule &&
 248                git -C submodule log -1 --oneline >actual &&
 249                git -C ../submodule log -1 --oneline master >expect &&
 250                test_cmp expect actual &&
 251                git checkout -b test-branch &&
 252                git submodule update --remote --force submodule &&
 253                git -C submodule log -1 --oneline >actual &&
 254                git -C ../submodule log -1 --oneline test-branch >expect &&
 255                test_cmp expect actual &&
 256                git checkout master &&
 257                git branch -d test-branch &&
 258                git reset --hard HEAD^
 259        )
 260'
 261
 262test_expect_success 'local config should override .gitmodules branch' '
 263        (cd submodule &&
 264         git checkout test-branch &&
 265         echo line5 >> file &&
 266         git add file &&
 267         test_tick &&
 268         git commit -m "upstream line5" &&
 269         git checkout master
 270        ) &&
 271        (cd super &&
 272         git config submodule.submodule.branch test-branch &&
 273         git submodule update --remote --force submodule &&
 274         cd submodule &&
 275         test "$(git log -1 --oneline)" = "$(GIT_DIR=../../submodule/.git git log -1 --oneline test-branch)"
 276        )
 277'
 278
 279test_expect_success 'submodule update --rebase staying on master' '
 280        (cd super/submodule &&
 281          git checkout master
 282        ) &&
 283        (cd super &&
 284         (cd submodule &&
 285          compare_head
 286         ) &&
 287         git submodule update --rebase submodule &&
 288         cd submodule &&
 289         compare_head
 290        )
 291'
 292
 293test_expect_success 'submodule update --merge staying on master' '
 294        (cd super/submodule &&
 295          git reset --hard HEAD~1
 296        ) &&
 297        (cd super &&
 298         (cd submodule &&
 299          compare_head
 300         ) &&
 301         git submodule update --merge submodule &&
 302         cd submodule &&
 303         compare_head
 304        )
 305'
 306
 307test_expect_success 'submodule update - rebase in .git/config' '
 308        (cd super &&
 309         git config submodule.submodule.update rebase
 310        ) &&
 311        (cd super/submodule &&
 312          git reset --hard HEAD~1
 313        ) &&
 314        (cd super &&
 315         (cd submodule &&
 316          compare_head
 317         ) &&
 318         git submodule update submodule &&
 319         cd submodule &&
 320         compare_head
 321        )
 322'
 323
 324test_expect_success 'submodule update - checkout in .git/config but --rebase given' '
 325        (cd super &&
 326         git config submodule.submodule.update checkout
 327        ) &&
 328        (cd super/submodule &&
 329          git reset --hard HEAD~1
 330        ) &&
 331        (cd super &&
 332         (cd submodule &&
 333          compare_head
 334         ) &&
 335         git submodule update --rebase submodule &&
 336         cd submodule &&
 337         compare_head
 338        )
 339'
 340
 341test_expect_success 'submodule update - merge in .git/config' '
 342        (cd super &&
 343         git config submodule.submodule.update merge
 344        ) &&
 345        (cd super/submodule &&
 346          git reset --hard HEAD~1
 347        ) &&
 348        (cd super &&
 349         (cd submodule &&
 350          compare_head
 351         ) &&
 352         git submodule update submodule &&
 353         cd submodule &&
 354         compare_head
 355        )
 356'
 357
 358test_expect_success 'submodule update - checkout in .git/config but --merge given' '
 359        (cd super &&
 360         git config submodule.submodule.update checkout
 361        ) &&
 362        (cd super/submodule &&
 363          git reset --hard HEAD~1
 364        ) &&
 365        (cd super &&
 366         (cd submodule &&
 367          compare_head
 368         ) &&
 369         git submodule update --merge submodule &&
 370         cd submodule &&
 371         compare_head
 372        )
 373'
 374
 375test_expect_success 'submodule update - checkout in .git/config' '
 376        (cd super &&
 377         git config submodule.submodule.update checkout
 378        ) &&
 379        (cd super/submodule &&
 380          git reset --hard HEAD^
 381        ) &&
 382        (cd super &&
 383         (cd submodule &&
 384          compare_head
 385         ) &&
 386         git submodule update submodule &&
 387         cd submodule &&
 388         ! compare_head
 389        )
 390'
 391
 392test_expect_success 'submodule update - command in .git/config' '
 393        (cd super &&
 394         git config submodule.submodule.update "!git checkout"
 395        ) &&
 396        (cd super/submodule &&
 397          git reset --hard HEAD^
 398        ) &&
 399        (cd super &&
 400         (cd submodule &&
 401          compare_head
 402         ) &&
 403         git submodule update submodule &&
 404         cd submodule &&
 405         ! compare_head
 406        )
 407'
 408
 409test_expect_success 'submodule update - command in .gitmodules is ignored' '
 410        test_when_finished "git -C super reset --hard HEAD^" &&
 411        git -C super config -f .gitmodules submodule.submodule.update "!false" &&
 412        git -C super commit -a -m "add command to .gitmodules file" &&
 413        git -C super/submodule reset --hard $submodulesha1^ &&
 414        git -C super submodule update submodule
 415'
 416
 417cat << EOF >expect
 418Execution of 'false $submodulesha1' failed in submodule path 'submodule'
 419EOF
 420
 421test_expect_success 'submodule update - command in .git/config catches failure' '
 422        (cd super &&
 423         git config submodule.submodule.update "!false"
 424        ) &&
 425        (cd super/submodule &&
 426          git reset --hard $submodulesha1^
 427        ) &&
 428        (cd super &&
 429         test_must_fail git submodule update submodule 2>../actual
 430        ) &&
 431        test_i18ncmp actual expect
 432'
 433
 434cat << EOF >expect
 435Execution of 'false $submodulesha1' failed in submodule path '../submodule'
 436EOF
 437
 438test_expect_success 'submodule update - command in .git/config catches failure -- subdirectory' '
 439        (cd super &&
 440         git config submodule.submodule.update "!false"
 441        ) &&
 442        (cd super/submodule &&
 443          git reset --hard $submodulesha1^
 444        ) &&
 445        (cd super &&
 446         mkdir tmp && cd tmp &&
 447         test_must_fail git submodule update ../submodule 2>../../actual
 448        ) &&
 449        test_i18ncmp actual expect
 450'
 451
 452test_expect_success 'submodule update - command run for initial population of submodule' '
 453        cat >expect <<-EOF &&
 454        Execution of '\''false $submodulesha1'\'' failed in submodule path '\''submodule'\''
 455        EOF
 456        rm -rf super/submodule &&
 457        test_must_fail git -C super submodule update 2>actual &&
 458        test_i18ncmp expect actual &&
 459        git -C super submodule update --checkout
 460'
 461
 462cat << EOF >expect
 463Execution of 'false $submodulesha1' failed in submodule path '../super/submodule'
 464Failed to recurse into submodule path '../super'
 465EOF
 466
 467test_expect_success 'recursive submodule update - command in .git/config catches failure -- subdirectory' '
 468        (cd recursivesuper &&
 469         git submodule update --remote super &&
 470         git add super &&
 471         git commit -m "update to latest to have more than one commit in submodules"
 472        ) &&
 473        git -C recursivesuper/super config submodule.submodule.update "!false" &&
 474        git -C recursivesuper/super/submodule reset --hard $submodulesha1^ &&
 475        (cd recursivesuper &&
 476         mkdir -p tmp && cd tmp &&
 477         test_must_fail git submodule update --recursive ../super 2>../../actual
 478        ) &&
 479        test_i18ncmp actual expect
 480'
 481
 482test_expect_success 'submodule init does not copy command into .git/config' '
 483        (cd super &&
 484         H=$(git ls-files -s submodule | cut -d" " -f2) &&
 485         mkdir submodule1 &&
 486         git update-index --add --cacheinfo 160000 $H submodule1 &&
 487         git config -f .gitmodules submodule.submodule1.path submodule1 &&
 488         git config -f .gitmodules submodule.submodule1.url ../submodule &&
 489         git config -f .gitmodules submodule.submodule1.update !false &&
 490         git submodule init submodule1 &&
 491         echo "none" >expect &&
 492         git config submodule.submodule1.update >actual &&
 493         test_cmp expect actual
 494        )
 495'
 496
 497test_expect_success 'submodule init picks up rebase' '
 498        (cd super &&
 499         git config -f .gitmodules submodule.rebasing.update rebase &&
 500         git submodule init rebasing &&
 501         test "rebase" = "$(git config submodule.rebasing.update)"
 502        )
 503'
 504
 505test_expect_success 'submodule init picks up merge' '
 506        (cd super &&
 507         git config -f .gitmodules submodule.merging.update merge &&
 508         git submodule init merging &&
 509         test "merge" = "$(git config submodule.merging.update)"
 510        )
 511'
 512
 513test_expect_success 'submodule update --merge  - ignores --merge  for new submodules' '
 514        test_config -C super submodule.submodule.update checkout &&
 515        (cd super &&
 516         rm -rf submodule &&
 517         git submodule update submodule &&
 518         git status -s submodule >expect &&
 519         rm -rf submodule &&
 520         git submodule update --merge submodule &&
 521         git status -s submodule >actual &&
 522         test_cmp expect actual
 523        )
 524'
 525
 526test_expect_success 'submodule update --rebase - ignores --rebase for new submodules' '
 527        test_config -C super submodule.submodule.update checkout &&
 528        (cd super &&
 529         rm -rf submodule &&
 530         git submodule update submodule &&
 531         git status -s submodule >expect &&
 532         rm -rf submodule &&
 533         git submodule update --rebase submodule &&
 534         git status -s submodule >actual &&
 535         test_cmp expect actual
 536        )
 537'
 538
 539test_expect_success 'submodule update ignores update=merge config for new submodules' '
 540        (cd super &&
 541         rm -rf submodule &&
 542         git submodule update submodule &&
 543         git status -s submodule >expect &&
 544         rm -rf submodule &&
 545         git config submodule.submodule.update merge &&
 546         git submodule update submodule &&
 547         git status -s submodule >actual &&
 548         git config --unset submodule.submodule.update &&
 549         test_cmp expect actual
 550        )
 551'
 552
 553test_expect_success 'submodule update ignores update=rebase config for new submodules' '
 554        (cd super &&
 555         rm -rf submodule &&
 556         git submodule update submodule &&
 557         git status -s submodule >expect &&
 558         rm -rf submodule &&
 559         git config submodule.submodule.update rebase &&
 560         git submodule update submodule &&
 561         git status -s submodule >actual &&
 562         git config --unset submodule.submodule.update &&
 563         test_cmp expect actual
 564        )
 565'
 566
 567test_expect_success 'submodule init picks up update=none' '
 568        (cd super &&
 569         git config -f .gitmodules submodule.none.update none &&
 570         git submodule init none &&
 571         test "none" = "$(git config submodule.none.update)"
 572        )
 573'
 574
 575test_expect_success 'submodule update - update=none in .git/config' '
 576        (cd super &&
 577         git config submodule.submodule.update none &&
 578         (cd submodule &&
 579          git checkout master &&
 580          compare_head
 581         ) &&
 582         git diff --name-only | grep ^submodule$ &&
 583         git submodule update &&
 584         git diff --name-only | grep ^submodule$ &&
 585         (cd submodule &&
 586          compare_head
 587         ) &&
 588         git config --unset submodule.submodule.update &&
 589         git submodule update submodule
 590        )
 591'
 592
 593test_expect_success 'submodule update - update=none in .git/config but --checkout given' '
 594        (cd super &&
 595         git config submodule.submodule.update none &&
 596         (cd submodule &&
 597          git checkout master &&
 598          compare_head
 599         ) &&
 600         git diff --name-only | grep ^submodule$ &&
 601         git submodule update --checkout &&
 602         git diff --name-only >out &&
 603         ! grep ^submodule$ out &&
 604         (cd submodule &&
 605          test_must_fail compare_head
 606         ) &&
 607         git config --unset submodule.submodule.update
 608        )
 609'
 610
 611test_expect_success 'submodule update --init skips submodule with update=none' '
 612        (cd super &&
 613         git add .gitmodules &&
 614         git commit -m ".gitmodules"
 615        ) &&
 616        git clone super cloned &&
 617        (cd cloned &&
 618         git submodule update --init &&
 619         test -e submodule/.git &&
 620         test_must_fail test -e none/.git
 621        )
 622'
 623
 624test_expect_success 'submodule update continues after checkout error' '
 625        (cd super &&
 626         git reset --hard HEAD &&
 627         git submodule add ../submodule submodule2 &&
 628         git submodule init &&
 629         git commit -am "new_submodule" &&
 630         (cd submodule2 &&
 631          git rev-parse --verify HEAD >../expect
 632         ) &&
 633         (cd submodule &&
 634          test_commit "update_submodule" file
 635         ) &&
 636         (cd submodule2 &&
 637          test_commit "update_submodule2" file
 638         ) &&
 639         git add submodule &&
 640         git add submodule2 &&
 641         git commit -m "two_new_submodule_commits" &&
 642         (cd submodule &&
 643          echo "" > file
 644         ) &&
 645         git checkout HEAD^ &&
 646         test_must_fail git submodule update &&
 647         (cd submodule2 &&
 648          git rev-parse --verify HEAD >../actual
 649         ) &&
 650         test_cmp expect actual
 651        )
 652'
 653test_expect_success 'submodule update continues after recursive checkout error' '
 654        (cd super &&
 655         git reset --hard HEAD &&
 656         git checkout master &&
 657         git submodule update &&
 658         (cd submodule &&
 659          git submodule add ../submodule subsubmodule &&
 660          git submodule init &&
 661          git commit -m "new_subsubmodule"
 662         ) &&
 663         git add submodule &&
 664         git commit -m "update_submodule" &&
 665         (cd submodule &&
 666          (cd subsubmodule &&
 667           test_commit "update_subsubmodule" file
 668          ) &&
 669          git add subsubmodule &&
 670          test_commit "update_submodule_again" file &&
 671          (cd subsubmodule &&
 672           test_commit "update_subsubmodule_again" file
 673          ) &&
 674          test_commit "update_submodule_again_again" file
 675         ) &&
 676         (cd submodule2 &&
 677          git rev-parse --verify HEAD >../expect &&
 678          test_commit "update_submodule2_again" file
 679         ) &&
 680         git add submodule &&
 681         git add submodule2 &&
 682         git commit -m "new_commits" &&
 683         git checkout HEAD^ &&
 684         (cd submodule &&
 685          git checkout HEAD^ &&
 686          (cd subsubmodule &&
 687           echo "" > file
 688          )
 689         ) &&
 690         test_must_fail git submodule update --recursive &&
 691         (cd submodule2 &&
 692          git rev-parse --verify HEAD >../actual
 693         ) &&
 694         test_cmp expect actual
 695        )
 696'
 697
 698test_expect_success 'submodule update exit immediately in case of merge conflict' '
 699        (cd super &&
 700         git checkout master &&
 701         git reset --hard HEAD &&
 702         (cd submodule &&
 703          (cd subsubmodule &&
 704           git reset --hard HEAD
 705          )
 706         ) &&
 707         git submodule update --recursive &&
 708         (cd submodule &&
 709          test_commit "update_submodule_2" file
 710         ) &&
 711         (cd submodule2 &&
 712          test_commit "update_submodule2_2" file
 713         ) &&
 714         git add submodule &&
 715         git add submodule2 &&
 716         git commit -m "two_new_submodule_commits" &&
 717         (cd submodule &&
 718          git checkout master &&
 719          test_commit "conflict" file &&
 720          echo "conflict" > file
 721         ) &&
 722         git checkout HEAD^ &&
 723         (cd submodule2 &&
 724          git rev-parse --verify HEAD >../expect
 725         ) &&
 726         git config submodule.submodule.update merge &&
 727         test_must_fail git submodule update &&
 728         (cd submodule2 &&
 729          git rev-parse --verify HEAD >../actual
 730         ) &&
 731         test_cmp expect actual
 732        )
 733'
 734
 735test_expect_success 'submodule update exit immediately after recursive rebase error' '
 736        (cd super &&
 737         git checkout master &&
 738         git reset --hard HEAD &&
 739         (cd submodule &&
 740          git reset --hard HEAD &&
 741          git submodule update --recursive
 742         ) &&
 743         (cd submodule &&
 744          test_commit "update_submodule_3" file
 745         ) &&
 746         (cd submodule2 &&
 747          test_commit "update_submodule2_3" file
 748         ) &&
 749         git add submodule &&
 750         git add submodule2 &&
 751         git commit -m "two_new_submodule_commits" &&
 752         (cd submodule &&
 753          git checkout master &&
 754          test_commit "conflict2" file &&
 755          echo "conflict" > file
 756         ) &&
 757         git checkout HEAD^ &&
 758         (cd submodule2 &&
 759          git rev-parse --verify HEAD >../expect
 760         ) &&
 761         git config submodule.submodule.update rebase &&
 762         test_must_fail git submodule update &&
 763         (cd submodule2 &&
 764          git rev-parse --verify HEAD >../actual
 765         ) &&
 766         test_cmp expect actual
 767        )
 768'
 769
 770test_expect_success 'add different submodules to the same path' '
 771        (cd super &&
 772         git submodule add ../submodule s1 &&
 773         test_must_fail git submodule add ../merging s1
 774        )
 775'
 776
 777test_expect_success 'submodule add places git-dir in superprojects git-dir' '
 778        (cd super &&
 779         mkdir deeper &&
 780         git submodule add ../submodule deeper/submodule &&
 781         (cd deeper/submodule &&
 782          git log > ../../expected
 783         ) &&
 784         (cd .git/modules/deeper/submodule &&
 785          git log > ../../../../actual
 786         ) &&
 787         test_cmp actual expected
 788        )
 789'
 790
 791test_expect_success 'submodule update places git-dir in superprojects git-dir' '
 792        (cd super &&
 793         git commit -m "added submodule"
 794        ) &&
 795        git clone super super2 &&
 796        (cd super2 &&
 797         git submodule init deeper/submodule &&
 798         git submodule update &&
 799         (cd deeper/submodule &&
 800          git log > ../../expected
 801         ) &&
 802         (cd .git/modules/deeper/submodule &&
 803          git log > ../../../../actual
 804         ) &&
 805         test_cmp actual expected
 806        )
 807'
 808
 809test_expect_success 'submodule add places git-dir in superprojects git-dir recursive' '
 810        (cd super2 &&
 811         (cd deeper/submodule &&
 812          git submodule add ../submodule subsubmodule &&
 813          (cd subsubmodule &&
 814           git log > ../../../expected
 815          ) &&
 816          git commit -m "added subsubmodule" &&
 817          git push origin :
 818         ) &&
 819         (cd .git/modules/deeper/submodule/modules/subsubmodule &&
 820          git log > ../../../../../actual
 821         ) &&
 822         git add deeper/submodule &&
 823         git commit -m "update submodule" &&
 824         git push origin : &&
 825         test_cmp actual expected
 826        )
 827'
 828
 829test_expect_success 'submodule update places git-dir in superprojects git-dir recursive' '
 830        mkdir super_update_r &&
 831        (cd super_update_r &&
 832         git init --bare
 833        ) &&
 834        mkdir subsuper_update_r &&
 835        (cd subsuper_update_r &&
 836         git init --bare
 837        ) &&
 838        mkdir subsubsuper_update_r &&
 839        (cd subsubsuper_update_r &&
 840         git init --bare
 841        ) &&
 842        git clone subsubsuper_update_r subsubsuper_update_r2 &&
 843        (cd subsubsuper_update_r2 &&
 844         test_commit "update_subsubsuper" file &&
 845         git push origin master
 846        ) &&
 847        git clone subsuper_update_r subsuper_update_r2 &&
 848        (cd subsuper_update_r2 &&
 849         test_commit "update_subsuper" file &&
 850         git submodule add ../subsubsuper_update_r subsubmodule &&
 851         git commit -am "subsubmodule" &&
 852         git push origin master
 853        ) &&
 854        git clone super_update_r super_update_r2 &&
 855        (cd super_update_r2 &&
 856         test_commit "update_super" file &&
 857         git submodule add ../subsuper_update_r submodule &&
 858         git commit -am "submodule" &&
 859         git push origin master
 860        ) &&
 861        rm -rf super_update_r2 &&
 862        git clone super_update_r super_update_r2 &&
 863        (cd super_update_r2 &&
 864         git submodule update --init --recursive >actual &&
 865         test_i18ngrep "Submodule path .submodule/subsubmodule.: checked out" actual &&
 866         (cd submodule/subsubmodule &&
 867          git log > ../../expected
 868         ) &&
 869         (cd .git/modules/submodule/modules/subsubmodule &&
 870          git log > ../../../../../actual
 871         ) &&
 872         test_cmp actual expected
 873        )
 874'
 875
 876test_expect_success 'submodule add properly re-creates deeper level submodules' '
 877        (cd super &&
 878         git reset --hard master &&
 879         rm -rf deeper/ &&
 880         git submodule add --force ../submodule deeper/submodule
 881        )
 882'
 883
 884test_expect_success 'submodule update properly revives a moved submodule' '
 885        (cd super &&
 886         H=$(git rev-parse --short HEAD) &&
 887         git commit -am "pre move" &&
 888         H2=$(git rev-parse --short HEAD) &&
 889         git status | sed "s/$H/XXX/" >expect &&
 890         H=$(cd submodule2 && git rev-parse HEAD) &&
 891         git rm --cached submodule2 &&
 892         rm -rf submodule2 &&
 893         mkdir -p "moved/sub module" &&
 894         git update-index --add --cacheinfo 160000 $H "moved/sub module" &&
 895         git config -f .gitmodules submodule.submodule2.path "moved/sub module" &&
 896         git commit -am "post move" &&
 897         git submodule update &&
 898         git status | sed "s/$H2/XXX/" >actual &&
 899         test_cmp expect actual
 900        )
 901'
 902
 903test_expect_success SYMLINKS 'submodule update can handle symbolic links in pwd' '
 904        mkdir -p linked/dir &&
 905        ln -s linked/dir linkto &&
 906        (cd linkto &&
 907         git clone "$TRASH_DIRECTORY"/super_update_r2 super &&
 908         (cd super &&
 909          git submodule update --init --recursive
 910         )
 911        )
 912'
 913
 914test_expect_success 'submodule update clone shallow submodule' '
 915        test_when_finished "rm -rf super3" &&
 916        first=$(git -C cloned submodule status submodule |cut -c2-41) &&
 917        second=$(git -C submodule rev-parse HEAD) &&
 918        commit_count=$(git -C submodule rev-list --count $first^..$second) &&
 919        git clone cloned super3 &&
 920        pwd=$(pwd) &&
 921        (
 922                cd super3 &&
 923                sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
 924                mv -f .gitmodules.tmp .gitmodules &&
 925                git submodule update --init --depth=$commit_count &&
 926                test 1 = $(git -C submodule log --oneline | wc -l)
 927        )
 928'
 929
 930test_expect_success 'submodule update clone shallow submodule outside of depth' '
 931        test_when_finished "rm -rf super3" &&
 932        git clone cloned super3 &&
 933        pwd=$(pwd) &&
 934        (
 935                cd super3 &&
 936                sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
 937                mv -f .gitmodules.tmp .gitmodules &&
 938                test_must_fail git submodule update --init --depth=1 2>actual &&
 939                test_i18ngrep "Direct fetching of that commit failed." actual &&
 940                git -C ../submodule config uploadpack.allowReachableSHA1InWant true &&
 941                git submodule update --init --depth=1 >actual &&
 942                test 1 = $(git -C submodule log --oneline | wc -l)
 943        )
 944'
 945
 946test_expect_success 'submodule update --recursive drops module name before recursing' '
 947        (cd super2 &&
 948         (cd deeper/submodule/subsubmodule &&
 949          git checkout HEAD^
 950         ) &&
 951         git submodule update --recursive deeper/submodule >actual &&
 952         test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual
 953        )
 954'
 955
 956test_expect_success 'submodule update can be run in parallel' '
 957        (cd super2 &&
 958         GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 7 &&
 959         grep "7 tasks" trace.out &&
 960         git config submodule.fetchJobs 8 &&
 961         GIT_TRACE=$(pwd)/trace.out git submodule update &&
 962         grep "8 tasks" trace.out &&
 963         GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 9 &&
 964         grep "9 tasks" trace.out
 965        )
 966'
 967
 968test_expect_success 'git clone passes the parallel jobs config on to submodules' '
 969        test_when_finished "rm -rf super4" &&
 970        GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 7 . super4 &&
 971        grep "7 tasks" trace.out &&
 972        rm -rf super4 &&
 973        git config --global submodule.fetchJobs 8 &&
 974        GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules . super4 &&
 975        grep "8 tasks" trace.out &&
 976        rm -rf super4 &&
 977        GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 9 . super4 &&
 978        grep "9 tasks" trace.out &&
 979        rm -rf super4
 980'
 981
 982test_done