summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-18 21:49:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-18 21:49:52 (GMT)
commit4744d03a47d668e0e2ea45a637fd16d782e035b9 (patch)
treee798f3d9d71821d9ceb967e7def0ea051ad19428
parent9c51ad58533445719f288f109d90787d99563ec5 (diff)
parente3a9d1aca92d90f2fdfbefd29827f7d7d210947e (diff)
downloadgit-4744d03a47d668e0e2ea45a637fd16d782e035b9.zip
git-4744d03a47d668e0e2ea45a637fd16d782e035b9.tar.gz
git-4744d03a47d668e0e2ea45a637fd16d782e035b9.tar.bz2
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
-rw-r--r--builtin/submodule--helper.c2
-rwxr-xr-xt/t5526-fetch-submodules.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index b45514b..0c5b2eb 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -1552,7 +1552,7 @@ struct submodule_update_clone {
#define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \
SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, 0, \
NULL, NULL, NULL, \
- NULL, 0, 0, 0, NULL, 0, 0, 0}
+ NULL, 0, 0, 0, NULL, 0, 0, 1}
static void next_submodule_warn_missing(struct submodule_update_clone *suc,
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 &&