aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-17 14:59:54 -0800
committerJunio C Hamano <gitster@pobox.com>2010-11-17 14:59:54 -0800
commit734e0ba43767ebb73bb35a921c0a38e956f0b4d1 (patch)
tree1a42b8de15fe36255d67a0ed67bb8de531b5e65d
parent07e0a8314d69986d368b08f8b602ac573fa7d9b6 (diff)
parent33f072f8910081b12780197a2a5423227e437af8 (diff)
downloadgit-734e0ba43767ebb73bb35a921c0a38e956f0b4d1.tar.gz
git-734e0ba43767ebb73bb35a921c0a38e956f0b4d1.tar.xz
Merge branch 'ak/submodule-sync'
* ak/submodule-sync: submodule sync: Update "submodule.<name>.url" for empty directories
-rwxr-xr-xgit-submodule.sh5
-rwxr-xr-xt/t7403-submodule-sync.sh12
2 files changed, 14 insertions, 3 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index 9ebbab798..c291eed59 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -836,11 +836,12 @@ cmd_sync()
;;
esac
+ say "Synchronizing submodule url for '$name'"
+ git config submodule."$name".url "$url"
+
if test -e "$path"/.git
then
(
- say "Synchronizing submodule url for '$name'"
- git config submodule."$name".url "$url"
clear_local_git_env
cd "$path"
remote=$(get_default_remote)
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index 02522f962..e5b19538b 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -23,7 +23,9 @@ test_expect_success setup '
git commit -m "submodule"
) &&
git clone super super-clone &&
- (cd super-clone && git submodule update --init)
+ (cd super-clone && git submodule update --init) &&
+ git clone super empty-clone &&
+ (cd empty-clone && git submodule init)
'
test_expect_success 'change submodule' '
@@ -64,4 +66,12 @@ test_expect_success '"git submodule sync" should update submodule URLs' '
)
'
+test_expect_success '"git submodule sync" should update submodule URLs if not yet cloned' '
+ (cd empty-clone &&
+ git pull &&
+ git submodule sync &&
+ test -d "$(git config submodule.submodule.url)"
+ )
+'
+
test_done