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
main
Junio C Hamano 2026-05-19 09:57:46 +09:00
commit bad1648bf0
2 changed files with 9 additions and 1 deletions

View File

@ -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);
}

View File

@ -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 &&