summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-31 16:25:29 -0700
committerJunio C Hamano <gitster@pobox.com>2010-08-31 16:25:29 -0700
commit2acf3658a31249d1a09573e2b6870871b5323121 (patch)
tree355a58f7ab9e715b2c5b6cc87b9c7d9ae42b9187
parentae76cb90cb835f9df42e849206ab55a1e1e1eea3 (diff)
parent0b9dca434f5d9208a26f47f7ec11453f1cfdfae8 (diff)
downloadgit-2acf3658a31249d1a09573e2b6870871b5323121.tar.gz
Merge branch 'da/fix-submodule-sync-superproject-config'
* da/fix-submodule-sync-superproject-config: submodule sync: Update "submodule.<name>.url"
-rwxr-xr-xgit-submodule.sh3
-rwxr-xr-xt/t7403-submodule-sync.sh3
2 files changed, 5 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index 170186f494..9ebbab798d 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -839,10 +839,11 @@ cmd_sync()
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)
- say "Synchronizing submodule url for '$name'"
git config remote."$remote".url "$url"
)
fi
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index bade2179b1..02522f9627 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -58,6 +58,9 @@ test_expect_success '"git submodule sync" should update submodule URLs' '
(cd super-clone/submodule &&
git checkout master &&
git pull
+ ) &&
+ (cd super-clone &&
+ test -d "$(git config submodule.submodule.url)"
)
'