[PATCH] Make 'submodule update' honor the 'update' setting in .gitmodules.
- From
- Mikhail Glushenkov <the.dead.shall.rise@gmail.com>
- Date
- Aug 6, 2009, 03:36 UTC
- Message-ID
- <1249529769-15720-1-git-send-email-the.dead.shall.rise@gmail.com>
Make the 'submodule update' command use the 'submodule.$path.update' setting in .gitmodules unless this setting is overridden in '.git/config' or with --rebase/--merge options.
Signed-off-by: Mikhail Glushenkov <the.dead.shall.rise@gmail.com> --- git-submodule.sh | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh index ebed711..636023a 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -372,6 +372,15 @@ cmd_update() name=$(module_name "$path") || exit url=$(git config submodule."$name".url) update_module=$(git config submodule."$name".update) + + if test -z "$update_module" + then + update_module="$(git config -f .gitmodules submodule."$name".update)" + test -z "$update_module" || + git config submodule."$name".update "$update_module" || + die "Failed to register update mode for submodule path '$path'" + fi + if test -z "$url" then # Only mention uninitialized submodules when its
-- 1.6.4