summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-16 19:41:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-16 19:41:14 (GMT)
commit1320352501a73a91d77b7865993f322026d056d7 (patch)
treea4aa71f2088901dc99ab7b072131e8ba96959dc4
parentf4af7f19639457d71c4e9b53892b937468824cac (diff)
parent7e60407f7a36bd1f7fd505f9aa9580a837fbb190 (diff)
downloadgit-1320352501a73a91d77b7865993f322026d056d7.zip
git-1320352501a73a91d77b7865993f322026d056d7.tar.gz
git-1320352501a73a91d77b7865993f322026d056d7.tar.bz2
Merge branch 'jl/submodule-update-quiet' into maint
* jl/submodule-update-quiet: submodule: update and add must honor --quiet flag
-rwxr-xr-xgit-submodule.sh9
-rwxr-xr-xt/t7400-submodule-basic.sh6
2 files changed, 11 insertions, 4 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index f8ea3bf..c94218b 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"
}
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 662fe91..c22916d 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -77,7 +77,8 @@ test_expect_success 'submodule add' '
(
cd addtest &&
- git submodule add "$submodurl" submod &&
+ git submodule add -q "$submodurl" submod >actual &&
+ test ! -s actual &&
git submodule init
) &&
@@ -275,7 +276,8 @@ test_expect_success 'update should work when path is an empty dir' '
echo "$rev1" >expect &&
mkdir init &&
- git submodule update &&
+ git submodule update -q >update.out &&
+ test ! -s update.out &&
inspect init &&
test_cmp expect head-sha1