Teach --recursive to submodule sync

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 <hordp@cisco.com>
Acked-By: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Jeff King <peff@peff.net>

diff --git a/git-submodule.sh b/git-submodule.sh
index ab6b1107b6090494f192f361471ed5748ffa7dc1..0ca3af2151d4cf73305aa80c84ef05083c4408ee 100755 (executable)
--- 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] 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
 OPTIONS_SPEC=
 . git-sh-setup
 . git-sh-i18n


@@ -1010,6 +1010,10 @@ cmd_sync()
                        GIT_QUIET=1
                        shift
                        ;;
                        GIT_QUIET=1
                        shift
                        ;;

+               --recursive)
+                       recursive=1
+                       shift
+                       ;;

                --)
                        shift
                        break
                --)
                        shift
                        break


@@ -1051,7 +1055,7 @@ cmd_sync()
 
                if git config "submodule.$name.url" >/dev/null 2>/dev/null
                then
 
                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
                        git config submodule."$name".url "$super_config_url"
 
                        if test -e "$sm_path"/.git


@@ -1061,6 +1065,12 @@ cmd_sync()
                                cd "$sm_path"
                                remote=$(get_default_remote)
                                git config remote."$remote".url "$sub_origin_url"
                                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
+                               fi

                        )
                        fi
                fi
                        )
                        fi
                fi