diff options
| -rwxr-xr-x | git-submodule.sh | 13 |
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 |