Skip to content

Commit

Permalink
Merge branch 'jl/submodule-update-quiet' into maint
Browse files Browse the repository at this point in the history
* jl/submodule-update-quiet:
  submodule: update and add must honor --quiet flag
  • Loading branch information
Junio C Hamano committed Aug 16, 2011
2 parents f4af7f1 + 7e60407 commit 1320352
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
9 changes: 7 additions & 2 deletions git-submodule.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
6 changes: 4 additions & 2 deletions t/t7400-submodule-basic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
) &&
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 1320352

Please sign in to comment.