summaryrefslogtreecommitdiff
path: root/t/t5526-fetch-submodules.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-12-13 19:02:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-12-14 02:54:56 (GMT)
commite3a9d1aca92d90f2fdfbefd29827f7d7d210947e (patch)
tree288aef06d88da1f2555928bd97893fe0a29f87e0 /t/t5526-fetch-submodules.sh
parent5d826e972970a784bd7a7bdf587512510097b8c7 (diff)
downloadgit-e3a9d1aca92d90f2fdfbefd29827f7d7d210947e.zip
git-e3a9d1aca92d90f2fdfbefd29827f7d7d210947e.tar.gz
git-e3a9d1aca92d90f2fdfbefd29827f7d7d210947e.tar.bz2
submodule update: run at most one fetch job unless otherwise set
In a028a1930c (fetching submodules: respect `submodule.fetchJobs` config option, 2016-02-29), we made sure to keep the default behavior of fetching at most one submodule at once when not setting the newly introduced `submodule.fetchJobs` config. This regressed in 90efe595c5 (builtin/submodule--helper: factor out submodule updating, 2018-08-03). Fix it. Reported-by: Sjon Hortensius <sjon@parse.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5526-fetch-submodules.sh')
-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 6c2f9b2..a031755 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 &&