summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-01-18 13:49:52 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-18 13:49:52 -0800
commit4744d03a47d668e0e2ea45a637fd16d782e035b9 (patch)
treee798f3d9d71821d9ceb967e7def0ea051ad19428 /t
parentMerge branch 'la/quiltimport-keep-non-patch' (diff)
parentsubmodule update: run at most one fetch job unless otherwise set (diff)
downloadtgif-4744d03a47d668e0e2ea45a637fd16d782e035b9.tar.xz
Merge branch 'sb/submodule-fetchjobs-default-to-one'
"git submodule update" ought to use a single job unless asked, but by mistake used multiple jobs, which has been fixed. * sb/submodule-fetchjobs-default-to-one: submodule update: run at most one fetch job unless otherwise set
Diffstat (limited to 't')
-rwxr-xr-xt/t5526-fetch-submodules.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index 6c2f9b2ba2..a0317556c6 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -524,6 +524,8 @@ test_expect_success 'fetching submodules respects parallel settings' '
git config fetch.recurseSubmodules true &&
(
cd downstream &&
+ GIT_TRACE=$(pwd)/trace.out git fetch &&
+ grep "1 tasks" trace.out &&
GIT_TRACE=$(pwd)/trace.out git fetch --jobs 7 &&
grep "7 tasks" trace.out &&
git config submodule.fetchJobs 8 &&