kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

fetch: use `fetch_config` to store "submodule.fetchJobs" value 

Move the parsed "submodule.fetchJobs" config value into the
`fetch_config` structure. This reduces our reliance on global variables
and further unifies the way we parse the configuration in git-fetch(1).

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Patrick Steinhardt 2023-05-17 13:49:17 +02:00 committed by Junio C Hamano
parent ac197cc094
commit f7e063f326
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/fetch.c
View File

@ -86,7 +86,6 @@ static int write_fetch_head = 1;
static int verbosity, deepen_relative, set_upstream, refetch; static int verbosity, deepen_relative, set_upstream, refetch;
static int progress = -1; static int progress = -1;
static int tags = TAGS_DEFAULT, update_shallow, deepen; static int tags = TAGS_DEFAULT, update_shallow, deepen;
static int submodule_fetch_jobs_config = -1;
static int atomic_fetch; static int atomic_fetch;
static enum transport_family family; static enum transport_family family;
static const char *depth; static const char *depth;
@ -108,6 +107,7 @@ struct fetch_config {
int show_forced_updates; int show_forced_updates;
int recurse_submodules; int recurse_submodules;
int parallel; int parallel;
int submodule_fetch_jobs;
}; };


static int git_fetch_config(const char *k, const char *v, void *cb) static int git_fetch_config(const char *k, const char *v, void *cb)
@ -136,7 +136,7 @@ static int git_fetch_config(const char *k, const char *v, void *cb)
} }


if (!strcmp(k, "submodule.fetchjobs")) { if (!strcmp(k, "submodule.fetchjobs")) {
submodule_fetch_jobs_config = parse_submodule_fetchjobs(k, v); fetch_config->submodule_fetch_jobs = parse_submodule_fetchjobs(k, v);
return 0; return 0;
} else if (!strcmp(k, "fetch.recursesubmodules")) { } else if (!strcmp(k, "fetch.recursesubmodules")) {
fetch_config->recurse_submodules = parse_fetch_recurse_submodules_arg(k, v); fetch_config->recurse_submodules = parse_fetch_recurse_submodules_arg(k, v);
@ -2119,6 +2119,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
.show_forced_updates = 1, .show_forced_updates = 1,
.recurse_submodules = RECURSE_SUBMODULES_DEFAULT, .recurse_submodules = RECURSE_SUBMODULES_DEFAULT,
.parallel = 1, .parallel = 1,
.submodule_fetch_jobs = -1,
}; };
const char *submodule_prefix = ""; const char *submodule_prefix = "";
const char *bundle_uri; const char *bundle_uri;
@ -2268,8 +2269,8 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
} }


if (config.recurse_submodules != RECURSE_SUBMODULES_OFF) { if (config.recurse_submodules != RECURSE_SUBMODULES_OFF) {
int *sfjc = submodule_fetch_jobs_config == -1 int *sfjc = config.submodule_fetch_jobs == -1
? &submodule_fetch_jobs_config : NULL; ? &config.submodule_fetch_jobs : NULL;
int *rs = config.recurse_submodules == RECURSE_SUBMODULES_DEFAULT int *rs = config.recurse_submodules == RECURSE_SUBMODULES_DEFAULT
? &config.recurse_submodules : NULL; ? &config.recurse_submodules : NULL;


@ -2432,7 +2433,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
int max_children = max_jobs; int max_children = max_jobs;


if (max_children < 0) if (max_children < 0)
max_children = submodule_fetch_jobs_config; max_children = config.submodule_fetch_jobs;
if (max_children < 0) if (max_children < 0)
max_children = config.parallel; max_children = config.parallel;