git submodule add ../none none &&
test_tick &&
git commit -m "none"
- ) &&
- (cd super &&
- git tag initial-setup
)
'
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
) &&
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