freshlybakedca.ke / git
Git fork
fork atom

config: drop `git_config_get_ulong()` wrapper

In 036876a1067 (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>

authored by

Patrick Steinhardt and committed by
Junio C Hamano d57f078e 3fda14d8

+8 -13
+2 -2
builtin/fast-import.c
··· 3523 3523 int limit; 3524 3524 unsigned long packsizelimit_value; 3525 3525 3526 - if (!git_config_get_ulong("pack.depth", &max_depth)) { 3526 + if (!repo_config_get_ulong(the_repository, "pack.depth", &max_depth)) { 3527 3527 if (max_depth > MAX_DEPTH) 3528 3528 max_depth = MAX_DEPTH; 3529 3529 } ··· 3533 3533 git_die_config(the_repository, "pack.indexversion", 3534 3534 "bad pack.indexVersion=%"PRIu32, pack_idx_opts.version); 3535 3535 } 3536 - if (!git_config_get_ulong("pack.packsizelimit", &packsizelimit_value)) 3536 + if (!repo_config_get_ulong(the_repository, "pack.packsizelimit", &packsizelimit_value)) 3537 3537 max_packsize = packsizelimit_value; 3538 3538 3539 3539 if (!repo_config_get_int(the_repository, "fastimport.unpacklimit", &limit))
+5 -5
builtin/gc.c
··· 195 195 repo_config_get_int(the_repository, "gc.autopacklimit", &cfg->gc_auto_pack_limit); 196 196 git_config_get_bool("gc.autodetach", &cfg->detach_auto); 197 197 git_config_get_bool("gc.cruftpacks", &cfg->cruft_packs); 198 - git_config_get_ulong("gc.maxcruftsize", &cfg->max_cruft_size); 198 + repo_config_get_ulong(the_repository, "gc.maxcruftsize", &cfg->max_cruft_size); 199 199 200 200 if (!repo_config_get_expiry(the_repository, "gc.pruneexpire", &owned)) { 201 201 free(cfg->prune_expire); ··· 212 212 cfg->gc_log_expire = owned; 213 213 } 214 214 215 - git_config_get_ulong("gc.bigpackthreshold", &cfg->big_pack_threshold); 216 - git_config_get_ulong("pack.deltacachesize", &cfg->max_delta_cache_size); 215 + repo_config_get_ulong(the_repository, "gc.bigpackthreshold", &cfg->big_pack_threshold); 216 + repo_config_get_ulong(the_repository, "pack.deltacachesize", &cfg->max_delta_cache_size); 217 217 218 - if (!git_config_get_ulong("core.deltabasecachelimit", &ulongval)) 218 + if (!repo_config_get_ulong(the_repository, "core.deltabasecachelimit", &ulongval)) 219 219 cfg->delta_base_cache_limit = ulongval; 220 220 221 221 if (!repo_config_get_string(the_repository, "gc.repackfilter", &owned)) { ··· 2344 2344 die(_("failed to create directories for '%s'"), filename); 2345 2345 2346 2346 if ((long)lock_file_timeout_ms < 0 && 2347 - git_config_get_ulong("gc.launchctlplistlocktimeoutms", 2347 + repo_config_get_ulong(the_repository, "gc.launchctlplistlocktimeoutms", 2348 2348 &lock_file_timeout_ms)) 2349 2349 lock_file_timeout_ms = 150; 2350 2350
-5
config.h
··· 719 719 int lookup_config(const char **mapping, int nr_mapping, const char *var); 720 720 721 721 # ifdef USE_THE_REPOSITORY_VARIABLE 722 - static inline int git_config_get_ulong(const char *key, unsigned long *dest) 723 - { 724 - return repo_config_get_ulong(the_repository, key, dest); 725 - } 726 - 727 722 static inline int git_config_get_bool(const char *key, int *dest) 728 723 { 729 724 return repo_config_get_bool(the_repository, key, dest);
+1 -1
http-backend.c
··· 247 247 struct strbuf var = STRBUF_INIT; 248 248 249 249 git_config_get_bool("http.getanyfile", &getanyfile); 250 - git_config_get_ulong("http.maxrequestbuffer", &max_request_buffer); 250 + repo_config_get_ulong(the_repository, "http.maxrequestbuffer", &max_request_buffer); 251 251 252 252 for (i = 0; i < ARRAY_SIZE(rpc_service); i++) { 253 253 struct rpc_service *svc = &rpc_service[i];