diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-09-01 13:50:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-01 13:50:46 -0700 |
| commit | e917918335e660629007f3d2d07d3d9a019b5273 (patch) | |
| tree | 6a4269e22fc7234f5816fbd721baffcf6db67b66 | |
| parent | Merge branch 'en/rebase-against-rebase-fix' into maint (diff) | |
| parent | submodule sync: Update "submodule.<name>.url" (diff) | |
| download | tgif-e917918335e660629007f3d2d07d3d9a019b5273.tar.xz | |
Merge branch 'da/fix-submodule-sync-superproject-config' into maint
* da/fix-submodule-sync-superproject-config:
submodule sync: Update "submodule.<name>.url"
| -rwxr-xr-x | git-submodule.sh | 3 | ||||
| -rwxr-xr-x | t/t7403-submodule-sync.sh | 3 |
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)" ) ' |