summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Heiko Voigt <hvoigt@hvoigt.net>2011-08-11 19:51:45 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-11 12:27:27 -0700
commit817bac35f24166e8b306ecef5283ed721068f113 (patch)
tree1f98a44f22bb8d8f78006d47c5ccb2b8024e3473
parentMerge branch 'oa/pull-reflog' (diff)
downloadtgif-817bac35f24166e8b306ecef5283ed721068f113.tar.xz
submodule: move update configuration variable further up
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>
-rwxr-xr-xgit-submodule.sh13
1 files changed, 7 insertions, 6 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index f46862f61b..e544dbc917 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -461,7 +461,13 @@ cmd_update()
fi
name=$(module_name "$path") || exit
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"
then
# 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'")"
fi
- if ! test -z "$update"
- then
- update_module=$update
- fi
-
if test "$subsha1" != "$sha1"
then
subforce=$force