зеркало из https://github.com/microsoft/git.git
Merge branch 'jl/submodule-update-quiet' into maint
* jl/submodule-update-quiet: submodule: update and add must honor --quiet flag
This commit is contained in:
Коммит
1320352501
|
@ -121,12 +121,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 "Clone of '$url' into submodule path '$path' failed"
|
die "Clone of '$url' into submodule path '$path' failed"
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
||||||
|
|
Загрузка…
Ссылка в новой задаче