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

submodule: move update configuration variable further up

Browse Source 
Lets always initialize the 'update_module' variable with the final
value. This way we allow code which wants to check this configuration
early to do so right in the beginning of cmd_update().

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Heiko Voigt 2011-08-11 19:51:45 +02:00 committed by Junio C Hamano
parent 1421fd9df4
commit 817bac35f2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
git-submodule.sh
View File

@ -461,7 +461,13 @@ cmd_update()
fi fi
name=$(module_name "$path") || exit name=$(module_name "$path") || exit
url=$(git config submodule."$name".url) url=$(git config submodule."$name".url)
update_module=$(git config submodule."$name".update) if ! test -z "$update"
then
update_module=$update
else
update_module=$(git config submodule."$name".update)
fi
if test -z "$url" if test -z "$url"
then then
# Only mention uninitialized submodules when its # Only mention uninitialized submodules when its
@ -483,11 +489,6 @@ Maybe you want to use 'update --init'?")"
die "$(eval_gettext "Unable to find current revision in submodule path '\$path'")" die "$(eval_gettext "Unable to find current revision in submodule path '\$path'")"
fi fi
if ! test -z "$update"
then
update_module=$update
fi
if test "$subsha1" != "$sha1" if test "$subsha1" != "$sha1"
then then
subforce=$force subforce=$force