Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8

[git.git] / t / t7403-submodule-sync.sh

diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index e5b19538b0192e5ab5f9081b0c10ac0dc8497cb6..3620215c1f84b8e184b470c92b9a01c15fd75dc2 100755 (executable)
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -25,7 +25,8 @@ test_expect_success setup '
        git clone super super-clone &&
        (cd super-clone && git submodule update --init) &&
        git clone super empty-clone &&
-       (cd empty-clone && git submodule init)
+       (cd empty-clone && git submodule init) &&
+       git clone super top-only-clone
 '
 
 test_expect_success 'change submodule' '
@@ -52,11 +53,12 @@ test_expect_success 'change submodule url' '
 
 test_expect_success '"git submodule sync" should update submodule URLs' '
        (cd super-clone &&
-        git pull &&
+        git pull --no-recurse-submodules &&
         git submodule sync
        ) &&
-       test -d "$(git config -f super-clone/submodule/.git/config \
-                               remote.origin.url)" &&
+       test -d "$(cd super-clone/submodule &&
+        git config remote.origin.url
+       )" &&
        (cd super-clone/submodule &&
         git checkout master &&
         git pull
@@ -66,7 +68,7 @@ test_expect_success '"git submodule sync" should update submodule URLs' '
        )
 '
 
-test_expect_success '"git submodule sync" should update submodule URLs if not yet cloned' '
+test_expect_success '"git submodule sync" should update known submodule URLs' '
        (cd empty-clone &&
         git pull &&
         git submodule sync &&
@@ -74,4 +76,14 @@ test_expect_success '"git submodule sync" should update submodule URLs if not ye
        )
 '
 
+test_expect_success '"git submodule sync" should not vivify uninteresting submodule' '
+       (cd top-only-clone &&
+        git pull &&
+        git submodule sync &&
+        test -z "$(git config submodule.submodule.url)" &&
+        git submodule sync submodule &&
+        test -z "$(git config submodule.submodule.url)"
+       )
+'
+
 test_done