mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'jl/submodule-update-quiet'
* jl/submodule-update-quiet: submodule: update and add must honor --quiet flag
This commit is contained in:
commit
86c9cd8d25
|
@ -122,12 +122,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 "$(eval_gettext "Clone of '\$url' into submodule path '\$path' failed")"
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue