From: Saagar Jha via GitGitGadget Date: Sun, 10 May 2026 03:50:22 GMT Subject: [PATCH v4] submodule-config: fix reading submodule.fetchJobs Message-ID: In-Reply-To: From: Saagar Jha update_clone_config_from_gitmodules() passes &max_jobs to config_from_gitmodules(), but max_jobs is already a pointer. This causes the config value to be written to the wrong address and get dropped. Pass max_jobs directly. Signed-off-by: Saagar Jha --- submodule-config: fix reading submodule.fetchJobs Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2287%2Fsaagarjha%2Fmaint-v4 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2287/saagarjha/maint-v4 Pull-Request: https://github.com/git/git/pull/2287 Range-diff vs v3: 1: 70fb2ede0f ! 1: 415c17f4bb submodule-config: fix reading submodule.fetchJobs @@ t/t7406-submodule-update.sh: test_expect_success 'submodule update can be run in +test_expect_success 'submodule update honors fetch jobs config from .gitmodules' ' + test_when_finished "rm -rf super3" && + git clone cloned super3 && -+ (cd super3 && -+ git config -f .gitmodules submodule.fetchJobs 67 && -+ GIT_TRACE="$(pwd)/trace.out" git submodule update --init && -+ grep "67 tasks" trace.out -+ ) ++ 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' ' submodule-config.c | 2 +- t/t7406-submodule-update.sh | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/submodule-config.c b/submodule-config.c index 1f19fe2077..57b190678e 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -1037,5 +1037,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 && base-commit: 67ad42147a7acc2af6074753ebd03d904476118f -- gitgitgadget