# [PATCH] submodule sync: Update "submodule..url" 4 messages from 2010-08-18 to 2010-08-18. Participants: David Aguilar, Johannes Sixt. Thread: https://gitlist.dev/t/24779 ## David Aguilar, 2010-08-18 10:01 Subject: [PATCH] submodule sync: Update "submodule..url" Message-ID: <1282125673-22956-1-git-send-email-davvid@gmail.com> URL: https://gitlist.dev/e/1282125673-22956-1-git-send-email-davvid%40gmail.com ``` 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 --- git-submodule.sh | 3 ++- t/t7403-submodule-sync.sh | 3 +++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 170186f..be7e478 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -840,9 +840,10 @@ cmd_sync() then ( clear_local_git_env + say "Synchronizing submodule url for '$name'" + git config submodule."$name".url "$url" 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 7538756..3033c4a 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)" ) ' -- 1.7.2.1.97.g3235b.dirty ``` ## Johannes Sixt, 2010-08-18 10:45 Subject: Re: [PATCH] submodule sync: Update "submodule..url" Message-ID: <4C6BB9E2.4060700@viscovery.net> URL: https://gitlist.dev/e/4C6BB9E2.4060700%40viscovery.net In-Reply-To: <1282125673-22956-1-git-send-email-davvid@gmail.com> ``` Am 8/18/2010 12:01, schrieb David Aguilar: > @@ -840,9 +840,10 @@ cmd_sync() > then > ( > clear_local_git_env > + say "Synchronizing submodule url for '$name'" > + git config submodule."$name".url "$url" This git config applies to the super module, right? As such, shouldn't it happen before you clear_local_git_env? > cd "$path" > remote=$(get_default_remote) > - say "Synchronizing submodule url for '$name'" > git config remote."$remote".url "$url" > ) -- Hannes ``` ## David Aguilar, 2010-08-18 15:46 Subject: Re: [PATCH] submodule sync: Update "submodule..url" Message-ID: <20100818154637.GA10028@gmail.com> URL: https://gitlist.dev/e/20100818154637.GA10028%40gmail.com In-Reply-To: <4C6BB9E2.4060700@viscovery.net> ``` On Wed, Aug 18, 2010 at 12:45:54PM +0200, Johannes Sixt wrote: > Am 8/18/2010 12:01, schrieb David Aguilar: > > @@ -840,9 +840,10 @@ cmd_sync() > > then > > ( > > clear_local_git_env > > + say "Synchronizing submodule url for '$name'" > > + git config submodule."$name".url "$url" > > This git config applies to the super module, right? As such, shouldn't it > happen before you clear_local_git_env? Good catch, thanks. I'll resend. > > > cd "$path" > > remote=$(get_default_remote) > > - say "Synchronizing submodule url for '$name'" > > git config remote."$remote".url "$url" > > ) > > -- Hannes -- David ``` ## David Aguilar, 2010-08-18 15:58 Subject: [PATCH v2] submodule sync: Update "submodule..url" Message-ID: <1282147113-25816-1-git-send-email-davvid@gmail.com> URL: https://gitlist.dev/e/1282147113-25816-1-git-send-email-davvid%40gmail.com In-Reply-To: <4C6BB9E2.4060700@viscovery.net> ``` 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 --- Changes since v1: We now call clear_local_git_env after configuring the super project (thanks Johannes). git-submodule.sh | 3 ++- t/t7403-submodule-sync.sh | 3 +++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 170186f..9ebbab7 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 7538756..3033c4a 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)" ) ' -- 1.7.2.1.97.g3235b ```