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

submodule sync: do not auto-vivify uninteresting submodule

Browse Source 
Earlier 33f072f (submodule sync: Update "submodule.<name>.url" for empty
directories, 2010-10-08) attempted to fix a bug where "git submodule sync"
command does not update the URL if the current superproject does not have
a checkout of the submodule.

However, it did so by unconditionally registering submodule.$name.url to
every submodule in the project, even the ones that the user has never
showed interest in at all by running 'git submodule init' command. This
caused subsequent 'git submodule update' to start cloning/updating submodules
that are not interesting to the user at all.

Update the code so that the URL is updated from the .gitmodules file only
for submodules that already have submodule.$name.url entries, i.e. the
ones the user has showed interested in having a checkout.

Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-06-25 22:41:25 +02:00
parent 33f072f891
commit ccee60862b
3 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-submodule.txt
View File

@ -166,7 +166,9 @@ commit for each submodule.
sync:: sync::
Synchronizes submodules' remote URL configuration setting Synchronizes submodules' remote URL configuration setting
to the value specified in .gitmodules. This is useful when to the value specified in .gitmodules. It will only affect those
submodules which already have an url entry in .git/config (that is the
case when they are initialized or freshly added). This is useful when
submodule URLs change upstream and you need to update your local submodule URLs change upstream and you need to update your local
repositories accordingly. repositories accordingly.
+ +

23
git-submodule.sh
View File

@ -836,17 +836,20 @@ cmd_sync()
;; ;;
esac esac
say "Synchronizing submodule url for '$name'" if git config "submodule.$name.url" >/dev/null 2>/dev/null
git config submodule."$name".url "$url"
if test -e "$path"/.git
then then
( say "Synchronizing submodule url for '$name'"
clear_local_git_env git config submodule."$name".url "$url"
cd "$path"
remote=$(get_default_remote) if test -e "$path"/.git
git config remote."$remote".url "$url" then
) (
clear_local_git_env
cd "$path"
remote=$(get_default_remote)
git config remote."$remote".url "$url"
)
fi
fi fi
done done
} }

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

@ -25,7 +25,8 @@ test_expect_success setup '
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 && git clone super empty-clone &&
(cd empty-clone && git submodule init) (cd empty-clone && git submodule init) &&
git clone super top-only-clone
' '
test_expect_success 'change submodule' ' test_expect_success 'change submodule' '
@ -66,7 +67,7 @@ test_expect_success '"git submodule sync" should update submodule URLs' '
) )
' '
test_expect_success '"git submodule sync" should update submodule URLs if not yet cloned' ' test_expect_success '"git submodule sync" should update known submodule URLs' '
(cd empty-clone && (cd empty-clone &&
git pull && git pull &&
git submodule sync && git submodule sync &&
@ -74,4 +75,14 @@ test_expect_success '"git submodule sync" should update submodule URLs if not ye
) )
' '
test_expect_success '"git submodule sync" should not vivify uninteresting submodule' '
(cd top-only-clone &&
git pull &&
git submodule sync &&
test -z "$(git config submodule.submodule.url)" &&
git submodule sync submodule &&
test -z "$(git config submodule.submodule.url)"
)
'
test_done test_done