From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Aug 2018 18:33:54 +0000 (-0700)
Subject: Merge branch 'sb/pull-rebase-submodule'
X-Git-Tag: v2.19.0-rc0~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce9c6a3c78bc2e2ebbe5f3351a2623d6101985f8;p=thirdparty%2Fgit.git

Merge branch 'sb/pull-rebase-submodule'

"git pull --rebase -v" in a repository with a submodule barfed as
an intermediate process did not understand what "-v(erbose)" flag
meant, which has been fixed.

* sb/pull-rebase-submodule:
  git-submodule.sh: accept verbose flag in cmd_update to be non-quiet
---

ce9c6a3c78bc2e2ebbe5f3351a2623d6101985f8
diff --cc git-submodule.sh
index 8b5ad59bde,98049acc98..f7fd80345c
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -438,8 -516,11 +438,11 @@@ cmd_update(
  		-q|--quiet)
  			GIT_QUIET=1
  			;;
+ 		-v)
+ 			GIT_QUIET=0
+ 			;;
  		--progress)
 -			progress="--progress"
 +			progress=1
  			;;
  		-i|--init)
  			init=1