diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-15 10:24:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-15 10:24:01 -0800 |
| commit | a1b3293936e3ee3a431051d12744876e4f5b21eb (patch) | |
| tree | e5876c9e6ce02f3a8144a6bbc5d72edeb1034af2 /git-submodule.sh | |
| parent | 84fcfaf92b857b22e64f4d33e06cdd5701e5e331 (diff) | |
| parent | 44fa0ef58c9e323ab8824cbbc49417e0586de71b (diff) | |
| download | git-a1b3293936e3ee3a431051d12744876e4f5b21eb.tar.gz | |
Merge branch 'ph/submodule-sync-recursive'
Adds "--recursive" option to submodule sync.
* ph/submodule-sync-recursive:
Add tests for submodule sync --recursive
Teach --recursive to submodule sync
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 819eb5674a..0522c3871a 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -11,7 +11,7 @@ USAGE="[--quiet] add [-b branch] [-f|--force] [--name <name>] [--reference <repo 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 @@ -1032,6 +1032,10 @@ cmd_sync() GIT_QUIET=1 shift ;; + --recursive) + recursive=1 + shift + ;; --) shift break @@ -1073,7 +1077,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 @@ -1083,6 +1087,12 @@ 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 + fi ) fi fi |