Merge branch 'jl/submodule-update-quiet'

* jl/submodule-update-quiet:
  submodule: update and add must honor --quiet flag
maint
Junio C Hamano 2011-08-08 12:33:34 -07:00
commit 86c9cd8d25
2 changed files with 11 additions and 4 deletions

View File

@ -122,12 +122,17 @@ module_clone()
path=$1 path=$1
url=$2 url=$2
reference="$3" reference="$3"
quiet=
if test -n "$GIT_QUIET"
then
quiet=-q
fi


if test -n "$reference" if test -n "$reference"
then then
git-clone "$reference" -n "$url" "$path" git-clone $quiet "$reference" -n "$url" "$path"
else else
git-clone -n "$url" "$path" git-clone $quiet -n "$url" "$path"
fi || fi ||
die "$(eval_gettext "Clone of '\$url' into submodule path '\$path' failed")" die "$(eval_gettext "Clone of '\$url' into submodule path '\$path' failed")"
} }

View File

@ -77,7 +77,8 @@ test_expect_success 'submodule add' '


( (
cd addtest && cd addtest &&
git submodule add "$submodurl" submod && git submodule add -q "$submodurl" submod >actual &&
test ! -s actual &&
git submodule init git submodule init
) && ) &&


@ -275,7 +276,8 @@ test_expect_success 'update should work when path is an empty dir' '
echo "$rev1" >expect && echo "$rev1" >expect &&


mkdir init && mkdir init &&
git submodule update && git submodule update -q >update.out &&
test ! -s update.out &&


inspect init && inspect init &&
test_cmp expect head-sha1 test_cmp expect head-sha1