[PATCHv2 1/2] Teach --recursive to submodule sync
From: Phil Hord <hidden>
Date: 2016-06-15 22:55:07
Subsystem:
the rest · Maintainer:
Linus Torvalds
The submodule sync command was somehow left out when --recursive was added to the other submodule commands. Teach sync to handle the --recursive switch by recursing when we're in a submodule we are sync'ing. Change the report during sync to show submodule-path instead of submodule-name to be consistent with the other submodule commands and to help recursed paths make sense. Signed-off-by: Phil Hord <redacted> --- git-submodule.sh | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index ab6b110..f40da72 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh@@ -11,7 +11,7 @@ USAGE="[--quiet] add [-b branch] [-f|--force] [--reference <repository>] [--] <r or: $dashless [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...] or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...] or: $dashless [--quiet] foreach [--recursive] <command> - or: $dashless [--quiet] sync [--] [<path>...]" + or: $dashless [--quiet] sync [--recursive] [--] [<path>...]" OPTIONS_SPEC= . git-sh-setup . git-sh-i18n
@@ -1003,12 +1003,15 @@ cmd_status() # cmd_sync() { + orig_flags= while test $# -ne 0 do case "$1" in -q|--quiet) GIT_QUIET=1 - shift + ;; + --recursive) + recursive=1 ;; --) shift
@@ -1021,6 +1024,8 @@ cmd_sync() break ;; esac + orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")" + shift done cd_to_toplevel module_list "$@" |
@@ -1051,7 +1056,7 @@ cmd_sync() if git config "submodule.$name.url" >/dev/null 2>/dev/null then - say "$(eval_gettext "Synchronizing submodule url for '\$name'")" + say "$(eval_gettext "Synchronizing submodule url for '\$prefix\$sm_path'")" git config submodule."$name".url "$super_config_url" if test -e "$sm_path"/.git
@@ -1061,6 +1066,14 @@ cmd_sync() cd "$sm_path" remote=$(get_default_remote) git config remote."$remote".url "$sub_origin_url" + + if test -n "$recursive" + then + ( + prefix="$prefix$sm_path/" + eval cmd_sync "$orig_flags" + ) + fi ) fi fi
--
1.8.0.2.g35128e8