undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule sync: Update "submodule.<name>.url" for empty directories

Browse Source 
If a submodule directory has not been filled by "git submodule update"
yet, then "git submodule sync" must still update the super-project's
configuration for submodule.<name>.url.

This situation occurs when switching between branches with a module from
different urls and other branches without the submodule.

Signed-off-by: Andreas Köhler <andi5.py@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Andreas Köhler 2010-10-08 03:07:48 +02:00 committed by Junio C Hamano
parent 7c6eafa35a
commit 33f072f891
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-submodule.sh
View File

@ -836,11 +836,12 @@ cmd_sync()
;; ;;
esac esac
say "Synchronizing submodule url for '$name'"
git config submodule."$name".url "$url"
if test -e "$path"/.git if test -e "$path"/.git
then then
( (
say "Synchronizing submodule url for '$name'"
git config submodule."$name".url "$url"
clear_local_git_env clear_local_git_env
cd "$path" cd "$path"
remote=$(get_default_remote) remote=$(get_default_remote)

12
t/t7403-submodule-sync.sh
View File

@ -23,7 +23,9 @@ test_expect_success setup '
git commit -m "submodule" git commit -m "submodule"
) && ) &&
git clone super super-clone && 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' ' 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 test_done