diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-18 13:49:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-18 13:49:52 -0800 |
| commit | 4744d03a47d668e0e2ea45a637fd16d782e035b9 (patch) | |
| tree | e798f3d9d71821d9ceb967e7def0ea051ad19428 | |
| parent | 9c51ad58533445719f288f109d90787d99563ec5 (diff) | |
| parent | e3a9d1aca92d90f2fdfbefd29827f7d7d210947e (diff) | |
| download | git-4744d03a47d668e0e2ea45a637fd16d782e035b9.tar.gz | |
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.c | 2 | ||||
| -rwxr-xr-x | t/t5526-fetch-submodules.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index b45514be31..0c5b2eb5fc 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 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 && |