diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-05-19 09:57:46 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-05-19 09:57:46 +0900 |
| commit | bad1648bf00ba6cbbc3be7f7a925fc0aa12ae577 (patch) | |
| tree | b8ed2ef9190d09e86fe48dff0a6b0641ba60ae2b | |
| parent | ded7b8cf55e2f69261aa3a03cb387f1692316811 (diff) | |
| parent | aa45a5902f23975b7075c97ad0451f7b4e9ccd9a (diff) | |
Merge branch 'sj/submodule-update-clone-config-fix'
The configuration variable submodule.fetchJobs was not read correctly,
which has been corrected.
* sj/submodule-update-clone-config-fix:
submodule-config: fix reading submodule.fetchJobs
| -rw-r--r-- | submodule-config.c | 2 | ||||
| -rwxr-xr-x | t/t7406-submodule-update.sh | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/submodule-config.c b/submodule-config.c index 72a46b7a54..a81897b4e0 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -1038,5 +1038,5 @@ static int gitmodules_update_clone_config(const char *var, const char *value, void update_clone_config_from_gitmodules(int *max_jobs) { - config_from_gitmodules(gitmodules_update_clone_config, the_repository, &max_jobs); + config_from_gitmodules(gitmodules_update_clone_config, the_repository, max_jobs); } diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 3adab12091..6abb00876a 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -1055,6 +1055,14 @@ test_expect_success 'submodule update can be run in parallel' ' ) ' +test_expect_success 'submodule update honors fetch jobs config from .gitmodules' ' + test_when_finished "rm -rf super3" && + git clone cloned super3 && + git -C super3 config -f .gitmodules submodule.fetchJobs 67 && + GIT_TRACE="$(pwd)/trace.out" git -C super3 submodule update --init && + test_grep "67 tasks" trace.out +' + test_expect_success 'git clone passes the parallel jobs config on to submodules' ' test_when_finished "rm -rf super4" && GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 7 . super4 && |