summaryrefslogtreecommitdiff
path: root/git-submodule.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-26 16:09:22 -0700
committerJunio C Hamano <gitster@pobox.com>2016-09-26 16:09:22 -0700
commitc4dfd2291bec53eeb03660ca9856deb9694dc8f5 (patch)
tree3f323e30a37d27e10029edbee56029086dfea9b4 /git-submodule.sh
parentbd250ab5ce7d272a707f4d8d0b05d1db3516cf76 (diff)
parent72c5f88311dab7149fcca1f6029414ccb776fee8 (diff)
Merge branch 'jk/clone-recursive-progress'
"git clone --recurse-submodules" lost the progress eye-candy in recent update, which has been corrected. * jk/clone-recursive-progress: clone: pass --progress decision to recursive submodules
Diffstat (limited to 'git-submodule.sh')
-rwxr-xr-xgit-submodule.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index a1cc71b521..a024a135d6 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -44,6 +44,7 @@ update=
prefix=
custom_name=
depth=
+progress=
die_if_unmatched ()
{
@@ -498,6 +499,9 @@ cmd_update()
-q|--quiet)
GIT_QUIET=1
;;
+ --progress)
+ progress="--progress"
+ ;;
-i|--init)
init=1
;;
@@ -573,6 +577,7 @@ cmd_update()
{
git submodule--helper update-clone ${GIT_QUIET:+--quiet} \
+ ${progress:+"$progress"} \
${wt_prefix:+--prefix "$wt_prefix"} \
${prefix:+--recursive-prefix "$prefix"} \
${update:+--update "$update"} \