diff options
| author | David Aguilar <davvid@gmail.com> | 2010-08-18 08:58:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 13:54:30 -0700 |
| commit | 0b9dca434f5d9208a26f47f7ec11453f1cfdfae8 (patch) | |
| tree | e6e5cb8698b55956f6a99e9b8ba8902ed697b599 | |
| parent | 64fdc08dac6694d1e754580e7acb82dfa4988bb9 (diff) | |
| download | git-0b9dca434f5d9208a26f47f7ec11453f1cfdfae8.tar.gz | |
submodule sync: Update "submodule.<name>.url"
When "git submodule sync" synchronizes the repository URLs
it only updates submodules' .git/config. However, the old
URLs still exist in the super-project's .git/config.
Update the super-project's configuration so that commands
such as "git submodule update" use the URLs from .gitmodules.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 7538756487..3033c4a22d 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)" ) ' |