diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-04-02 14:15:36 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-04-02 14:15:36 -0700 |
commit | d851ffb91f8c25f51b284cd4e849757d656de0d1 (patch) | |
tree | aae922c6fa4df1621177805814815b59c95c101e /t | |
parent | edac360bdd35eacfb11005583aa7736d72a063bd (diff) | |
download | git-d851ffb91f8c25f51b284cd4e849757d656de0d1.tar.gz |
Revert "submodule: explicit local branch creation in module_clone"
This reverts commit 23d25e48f5ead73c9ce233986f90791abec9f1e8, as it is
broken for users who haven't opted into the new feature of checking
out submodule.*.branch with update mode set to checkout.
Diffstat (limited to 't')
-rwxr-xr-x | t/t7406-submodule-update.sh | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 28ca76384f..29d3d2cca0 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -63,9 +63,6 @@ test_expect_success 'setup a submodule tree' ' git submodule add ../none none && test_tick && git commit -m "none" - ) && - (cd super && - git tag initial-setup ) ' @@ -706,7 +703,7 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re git clone super_update_r super_update_r2 && (cd super_update_r2 && git submodule update --init --recursive >actual && - test_i18ngrep "Submodule path .submodule/subsubmodule.: .git reset --hard -q" actual && + test_i18ngrep "Submodule path .submodule/subsubmodule.: checked out" actual && (cd submodule/subsubmodule && git log > ../../expected ) && @@ -777,38 +774,4 @@ test_expect_success 'submodule update --recursive drops module name before recur test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual ) ' - -test_expect_success 'submodule update --checkout clones detached HEAD' ' - git clone super super4 && - echo "detached HEAD" >expected && - (cd super4 && - git reset --hard initial-setup && - git submodule init submodule && - git submodule update >> /tmp/log 2>&1 && - (cd submodule && - git symbolic-ref HEAD > ../../actual || - echo "detached HEAD" > ../../actual - ) - ) && - test_cmp actual expected && - rm -rf super4 -' - -test_expect_success 'submodule update --merge clones attached HEAD' ' - git clone super super4 && - echo "refs/heads/master" >expected && - (cd super4 && - git reset --hard initial-setup && - git submodule init submodule && - git config submodule.submodule.update merge && - git submodule update --merge && - (cd submodule && - git symbolic-ref HEAD > ../../actual || - echo "detached HEAD" > ../../actual - ) - ) && - test_cmp actual expected && - rm -rf super4 -' - test_done |