[PATCH 4/9] fetch: use `fetch_config` to store "fetch.prune" value
- From
Patrick Steinhardt <ps@pks.im>
- Date
- May 17, 2023, 11:48 UTC
- Message-ID
- <1fa4922bea12ef0363e2638bbb5c70218c6ec357.1684324059.git.ps@pks.im>
- In-Reply-To
- <cover.1684324059.git.ps@pks.im>
Move the parsed "fetch.prune" 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> --- builtin/fetch.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c index 401543e05d..488705b519 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -73,7 +73,6 @@ struct display_state { int url_len, shown_url; }; -static int fetch_prune_config = -1; /* unspecified */ static int fetch_show_forced_updates = 1; static uint64_t forced_updates_ms = 0; static int prefetch = 0; @@ -108,6 +107,7 @@ static struct string_list negotiation_tip = STRING_LIST_INIT_NODUP; struct fetch_config { enum display_format display_format; + int prune; }; static int git_fetch_config(const char *k, const char *v, void *cb) @@ -115,7 +115,7 @@ static int git_fetch_config(const char *k, const char *v, void *cb) struct fetch_config *fetch_config = cb; if (!strcmp(k, "fetch.prune")) { - fetch_prune_config = git_config_bool(k, v); + fetch_config->prune = git_config_bool(k, v); return 0; } @@ -2047,8 +2047,8 @@ static int fetch_one(struct remote *remote, int argc, const char **argv, /* no command line request */ if (0 <= remote->prune) prune = remote->prune; - else if (0 <= fetch_prune_config) - prune = fetch_prune_config; + else if (0 <= config->prune) + prune = config->prune; else prune = PRUNE_BY_DEFAULT; } @@ -2108,6 +2108,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) { struct fetch_config config = { .display_format = DISPLAY_FORMAT_FULL, + .prune = -1, }; const char *submodule_prefix = ""; const char *bundle_uri;
-- 2.40.1