unpack-trees: oneway_merge to update submodules

diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index 42251f7f3af0865a31fd38722fbf7433d81fe3f0..a552ad4ead899fbb431c68bef558811d25cd8c63 100755 (executable)
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -478,7 +478,47 @@ test_expect_success "don't fetch submodule when newly recorded commits are alrea
                git fetch >../actual.out 2>../actual.err
        ) &&
        ! test -s actual.out &&
-       test_i18ncmp expect.err actual.err
+       test_i18ncmp expect.err actual.err &&
+       (
+               cd submodule &&
+               git checkout -q master
+       )
+'
+
+test_expect_success "'fetch.recurseSubmodules=on-demand' works also without .gitmodule entry" '
+       (
+               cd downstream &&
+               git fetch --recurse-submodules
+       ) &&
+       add_upstream_commit &&
+       head1=$(git rev-parse --short HEAD) &&
+       git add submodule &&
+       git rm .gitmodules &&
+       git commit -m "new submodule without .gitmodules" &&
+       printf "" >expect.out &&
+       head2=$(git rev-parse --short HEAD) &&
+       echo "From $pwd/." >expect.err.2 &&
+       echo "   $head1..$head2  master     -> origin/master" >>expect.err.2 &&
+       head -3 expect.err >>expect.err.2 &&
+       (
+               cd downstream &&
+               rm .gitmodules &&
+               git config fetch.recurseSubmodules on-demand &&
+               # fake submodule configuration to avoid skipping submodule handling
+               git config -f .gitmodules submodule.fake.path fake &&
+               git config -f .gitmodules submodule.fake.url fakeurl &&
+               git add .gitmodules &&
+               git config --unset submodule.submodule.url &&
+               git fetch >../actual.out 2>../actual.err &&
+               # cleanup
+               git config --unset fetch.recurseSubmodules &&
+               git reset --hard
+       ) &&
+       test_i18ncmp expect.out actual.out &&
+       test_i18ncmp expect.err.2 actual.err &&
+       git checkout HEAD^ -- .gitmodules &&
+       git add .gitmodules &&
+       git commit -m "new submodule restored .gitmodules"
 '
 
 test_expect_success 'fetching submodules respects parallel settings' '
@@ -530,4 +570,39 @@ test_expect_success 'fetching submodule into a broken repository' '
        test_must_fail git -C dst fetch --recurse-submodules
 '
 
+test_expect_success "fetch new commits when submodule got renamed" '
+       git clone . downstream_rename &&
+       (
+               cd downstream_rename &&
+               git submodule update --init &&
+# NEEDSWORK: we omitted --recursive for the submodule update here since
+# that does not work. See test 7001 for mv "moving nested submodules"
+# for details. Once that is fixed we should add the --recursive option
+# here.
+               git checkout -b rename &&
+               git mv submodule submodule_renamed &&
+               (
+                       cd submodule_renamed &&
+                       git checkout -b rename_sub &&
+                       echo a >a &&
+                       git add a &&
+                       git commit -ma &&
+                       git push origin rename_sub &&
+                       git rev-parse HEAD >../../expect
+               ) &&
+               git add submodule_renamed &&
+               git commit -m "update renamed submodule" &&
+               git push origin rename
+       ) &&
+       (
+               cd downstream &&
+               git fetch --recurse-submodules=on-demand &&
+               (
+                       cd submodule &&
+                       git rev-parse origin/rename_sub >../../actual
+               )
+       ) &&
+       test_cmp expect actual
+'
+
 test_done