mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'nc/submodule-update-quiet'
"git submodule update --quiet" did not propagate the quiet option down to underlying "git fetch", which has been corrected. * nc/submodule-update-quiet: submodule update: silence underlying fetch with "--quiet"
This commit is contained in:
commit
74339f814c
|
@ -420,9 +420,9 @@ fetch_in_submodule () (
|
|||
cd "$1" &&
|
||||
if test $# -eq 3
|
||||
then
|
||||
echo "$3" | git fetch --stdin ${2:+"$2"}
|
||||
echo "$3" | git fetch ${GIT_QUIET:+--quiet} --stdin ${2:+"$2"}
|
||||
else
|
||||
git fetch ${2:+"$2"}
|
||||
git fetch ${GIT_QUIET:+--quiet} ${2:+"$2"}
|
||||
fi
|
||||
)
|
||||
|
||||
|
|
|
@ -1037,4 +1037,28 @@ test_expect_success 'submodule update --quiet passes quietness to merge/rebase'
|
|||
)
|
||||
'
|
||||
|
||||
test_expect_success 'submodule update --quiet passes quietness to fetch with a shallow clone' '
|
||||
test_when_finished "rm -rf super4 super5 super6" &&
|
||||
git clone . super4 &&
|
||||
(cd super4 &&
|
||||
git submodule add --quiet file://"$TRASH_DIRECTORY"/submodule submodule3 &&
|
||||
git commit -am "setup submodule3"
|
||||
) &&
|
||||
(cd submodule &&
|
||||
test_commit line6 file
|
||||
) &&
|
||||
git clone super4 super5 &&
|
||||
(cd super5 &&
|
||||
git submodule update --quiet --init --depth=1 submodule3 >out 2>err &&
|
||||
test_must_be_empty out &&
|
||||
test_must_be_empty err
|
||||
) &&
|
||||
git clone super4 super6 &&
|
||||
(cd super6 &&
|
||||
git submodule update --init --depth=1 submodule3 >out 2>err &&
|
||||
test_file_not_empty out &&
|
||||
test_file_not_empty err
|
||||
)
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue