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>

diff --git a/git-submodule.sh b/git-submodule.sh
index f46862f61b48a970f6ec24a9ae7624905ba3013a..e544dbc917b84dfe17597e90e9e48af5a1e5a196 100755 (executable)
--- 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)
                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
                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
 
                        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
                if test "$subsha1" != "$sha1"
                then
                        subforce=$force