diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2011-07-26 23:39:03 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-28 12:48:26 -0700 |
| commit | 7e60407f7a36bd1f7fd505f9aa9580a837fbb190 (patch) | |
| tree | d651cda63afbd15251c74bd1a8db516ee051bd9b /git-submodule.sh | |
| parent | 2579e1d2936ad4e385ef21e5c346d9853d7faa01 (diff) | |
| download | git-7e60407f7a36bd1f7fd505f9aa9580a837fbb190.tar.gz git-7e60407f7a36bd1f7fd505f9aa9580a837fbb190.tar.xz | |
submodule: update and add must honor --quiet flag
When using the --quiet flag "git submodule update" and "git submodule add"
didn't behave as the documentation stated. They printed progress output
from the clone, even though they should only print error messages.
Fix that by passing the -q flag to git clone in module_clone() when the
GIT_QUIET variable is set. Two tests in t7400 have been modified to test
that behavior.
Reported-by: Daniel Holtmann-Rice <flyingtabmow@gmail.com>
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index d189a24c7..11eab5080 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -121,12 +121,17 @@ module_clone() path=$1 url=$2 reference="$3" + quiet= + if test -n "$GIT_QUIET" + then + quiet=-q + fi if test -n "$reference" then - git-clone "$reference" -n "$url" "$path" + git-clone $quiet "$reference" -n "$url" "$path" else - git-clone -n "$url" "$path" + git-clone $quiet -n "$url" "$path" fi || die "Clone of '$url' into submodule path '$path' failed" } |