mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-01 14:46:08 +02:00
Code

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:
Junio C Hamano 2011-08-16 12:41:14 -07:00
parent f4af7f1963 7e60407f7a
commit 1320352501
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git-submodule.sh
View File

@ -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"
}

6
t/t7400-submodule-basic.sh
View File

@ -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