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

config: drop `git_config_get_ulong()` wrapper 

In 036876a106 (config: hide functions using `the_repository` by
default, 2024-08-13) we have moved around a bunch of functions in the
config subsystem that depend on `the_repository`. Those function have
been converted into mere wrappers around their equivalent function that
takes in a repository as parameter, and the intent was that we'll
eventually remove those wrappers to make the dependency on the global
repository variable explicit at the callsite.

Follow through with that intent and remove `git_config_get_ulong()`. All
callsites are adjusted so that they use
`repo_config_get_ulong(the_repository, ...)` instead. While some
callsites might already have a repository available, this mechanical
conversion is the exact same as the current situation and thus cannot
cause any regression. Those sites should eventually be cleaned up in a
later patch series.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Patrick Steinhardt 2025-07-23 16:08:31 +02:00 committed by Junio C Hamano
parent 3fda14d86d
commit d57f078e37
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/fast-import.c
View File

@ -3523,7 +3523,7 @@ static void git_pack_config(void)
int limit; int limit;
unsigned long packsizelimit_value; unsigned long packsizelimit_value;


if (!git_config_get_ulong("pack.depth", &max_depth)) { if (!repo_config_get_ulong(the_repository, "pack.depth", &max_depth)) {
if (max_depth > MAX_DEPTH) if (max_depth > MAX_DEPTH)
max_depth = MAX_DEPTH; max_depth = MAX_DEPTH;
} }
@ -3533,7 +3533,7 @@ static void git_pack_config(void)
git_die_config(the_repository, "pack.indexversion", git_die_config(the_repository, "pack.indexversion",
"bad pack.indexVersion=%"PRIu32, pack_idx_opts.version); "bad pack.indexVersion=%"PRIu32, pack_idx_opts.version);
} }
if (!git_config_get_ulong("pack.packsizelimit", &packsizelimit_value)) if (!repo_config_get_ulong(the_repository, "pack.packsizelimit", &packsizelimit_value))
max_packsize = packsizelimit_value; max_packsize = packsizelimit_value;


if (!repo_config_get_int(the_repository, "fastimport.unpacklimit", &limit)) if (!repo_config_get_int(the_repository, "fastimport.unpacklimit", &limit))

10
builtin/gc.c
View File

@ -195,7 +195,7 @@ static void gc_config(struct gc_config *cfg)
repo_config_get_int(the_repository, "gc.autopacklimit", &cfg->gc_auto_pack_limit); repo_config_get_int(the_repository, "gc.autopacklimit", &cfg->gc_auto_pack_limit);
git_config_get_bool("gc.autodetach", &cfg->detach_auto); git_config_get_bool("gc.autodetach", &cfg->detach_auto);
git_config_get_bool("gc.cruftpacks", &cfg->cruft_packs); git_config_get_bool("gc.cruftpacks", &cfg->cruft_packs);
git_config_get_ulong("gc.maxcruftsize", &cfg->max_cruft_size); repo_config_get_ulong(the_repository, "gc.maxcruftsize", &cfg->max_cruft_size);


if (!repo_config_get_expiry(the_repository, "gc.pruneexpire", &owned)) { if (!repo_config_get_expiry(the_repository, "gc.pruneexpire", &owned)) {
free(cfg->prune_expire); free(cfg->prune_expire);
@ -212,10 +212,10 @@ static void gc_config(struct gc_config *cfg)
cfg->gc_log_expire = owned; cfg->gc_log_expire = owned;
} }


git_config_get_ulong("gc.bigpackthreshold", &cfg->big_pack_threshold); repo_config_get_ulong(the_repository, "gc.bigpackthreshold", &cfg->big_pack_threshold);
git_config_get_ulong("pack.deltacachesize", &cfg->max_delta_cache_size); repo_config_get_ulong(the_repository, "pack.deltacachesize", &cfg->max_delta_cache_size);


if (!git_config_get_ulong("core.deltabasecachelimit", &ulongval)) if (!repo_config_get_ulong(the_repository, "core.deltabasecachelimit", &ulongval))
cfg->delta_base_cache_limit = ulongval; cfg->delta_base_cache_limit = ulongval;


if (!repo_config_get_string(the_repository, "gc.repackfilter", &owned)) { if (!repo_config_get_string(the_repository, "gc.repackfilter", &owned)) {
@ -2344,7 +2344,7 @@ static int launchctl_schedule_plist(const char *exec_path, enum schedule_priorit
die(_("failed to create directories for '%s'"), filename); die(_("failed to create directories for '%s'"), filename);


if ((long)lock_file_timeout_ms < 0 && if ((long)lock_file_timeout_ms < 0 &&
git_config_get_ulong("gc.launchctlplistlocktimeoutms", repo_config_get_ulong(the_repository, "gc.launchctlplistlocktimeoutms",
&lock_file_timeout_ms)) &lock_file_timeout_ms))
lock_file_timeout_ms = 150; lock_file_timeout_ms = 150;



5
config.h
View File

@ -719,11 +719,6 @@ NORETURN void git_die_config_linenr(const char *key, const char *filename, int l
int lookup_config(const char **mapping, int nr_mapping, const char *var); int lookup_config(const char **mapping, int nr_mapping, const char *var);


# ifdef USE_THE_REPOSITORY_VARIABLE # ifdef USE_THE_REPOSITORY_VARIABLE
static inline int git_config_get_ulong(const char *key, unsigned long *dest)
{
return repo_config_get_ulong(the_repository, key, dest);
}

static inline int git_config_get_bool(const char *key, int *dest) static inline int git_config_get_bool(const char *key, int *dest)
{ {
return repo_config_get_bool(the_repository, key, dest); return repo_config_get_bool(the_repository, key, dest);

2
http-backend.c
View File

@ -247,7 +247,7 @@ static void http_config(void)
struct strbuf var = STRBUF_INIT; struct strbuf var = STRBUF_INIT;


git_config_get_bool("http.getanyfile", &getanyfile); git_config_get_bool("http.getanyfile", &getanyfile);
git_config_get_ulong("http.maxrequestbuffer", &max_request_buffer); repo_config_get_ulong(the_repository, "http.maxrequestbuffer", &max_request_buffer);


for (i = 0; i < ARRAY_SIZE(rpc_service); i++) { for (i = 0; i < ARRAY_SIZE(rpc_service); i++) {
struct rpc_service *svc = &rpc_service[i]; struct rpc_service *svc = &rpc_service[i];