freshlybakedca.ke
Git fork
config: drop `git_config_get_bool()` 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_bool()`. All
callsites are adjusted so that they use
`repo_config_get_bool(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
5d215a7b
d57f078e
+1
-1
archive.c
+1
-1
archive.c
+4
-4
builtin/am.c
+4
-4
builtin/am.c
···
162
163
state->prec = 4;
164
165
-
git_config_get_bool("am.threeway", &state->threeway);
166
167
state->utf8 = 1;
168
169
-
git_config_get_bool("am.messageid", &state->message_id);
170
171
state->scissors = SCISSORS_UNSET;
172
state->quoted_cr = quoted_cr_unset;
173
174
strvec_init(&state->git_apply_opts);
175
176
-
if (!git_config_get_bool("commit.gpgsign", &gpgsign))
177
state->sign_commit = gpgsign ? "" : NULL;
178
}
179
···
965
{
966
if (keep_cr < 0) {
967
keep_cr = 0;
968
-
git_config_get_bool("am.keepcr", &keep_cr);
969
}
970
971
switch (patch_format) {
···
162
163
state->prec = 4;
164
165
+
repo_config_get_bool(the_repository, "am.threeway", &state->threeway);
166
167
state->utf8 = 1;
168
169
+
repo_config_get_bool(the_repository, "am.messageid", &state->message_id);
170
171
state->scissors = SCISSORS_UNSET;
172
state->quoted_cr = quoted_cr_unset;
173
174
strvec_init(&state->git_apply_opts);
175
176
+
if (!repo_config_get_bool(the_repository, "commit.gpgsign", &gpgsign))
177
state->sign_commit = gpgsign ? "" : NULL;
178
}
179
···
965
{
966
if (keep_cr < 0) {
967
keep_cr = 0;
968
+
repo_config_get_bool(the_repository, "am.keepcr", &keep_cr);
969
}
970
971
switch (patch_format) {
+1
-1
builtin/checkout.c
+1
-1
builtin/checkout.c
···
291
read_mmblob(&ours, &threeway[1]);
292
read_mmblob(&theirs, &threeway[2]);
293
294
+
repo_config_get_bool(the_repository, "merge.renormalize", &renormalize);
295
ll_opts.renormalize = renormalize;
296
ll_opts.conflict_style = conflict_style;
297
merge_status = ll_merge(&result_buf, path, &ancestor, "base",
+1
-1
builtin/clone.c
+1
-1
builtin/clone.c
+1
-1
builtin/credential-cache--daemon.c
+1
-1
builtin/credential-cache--daemon.c
+3
-3
builtin/gc.c
+3
-3
builtin/gc.c
···
193
repo_config_get_int(the_repository, "gc.aggressivedepth", &cfg->aggressive_depth);
194
repo_config_get_int(the_repository, "gc.auto", &cfg->gc_auto_threshold);
195
repo_config_get_int(the_repository, "gc.autopacklimit", &cfg->gc_auto_pack_limit);
196
-
git_config_get_bool("gc.autodetach", &cfg->detach_auto);
197
-
git_config_get_bool("gc.cruftpacks", &cfg->cruft_packs);
198
repo_config_get_ulong(the_repository, "gc.maxcruftsize", &cfg->max_cruft_size);
199
200
if (!repo_config_get_expiry(the_repository, "gc.pruneexpire", &owned)) {
···
1779
strbuf_reset(&config_name);
1780
strbuf_addf(&config_name, "maintenance.%s.enabled",
1781
tasks[i].name);
1782
-
if (!git_config_get_bool(config_name.buf, &config_value))
1783
strategy.tasks[i].enabled = config_value;
1784
if (!strategy.tasks[i].enabled)
1785
continue;
···
193
repo_config_get_int(the_repository, "gc.aggressivedepth", &cfg->aggressive_depth);
194
repo_config_get_int(the_repository, "gc.auto", &cfg->gc_auto_threshold);
195
repo_config_get_int(the_repository, "gc.autopacklimit", &cfg->gc_auto_pack_limit);
196
+
repo_config_get_bool(the_repository, "gc.autodetach", &cfg->detach_auto);
197
+
repo_config_get_bool(the_repository, "gc.cruftpacks", &cfg->cruft_packs);
198
repo_config_get_ulong(the_repository, "gc.maxcruftsize", &cfg->max_cruft_size);
199
200
if (!repo_config_get_expiry(the_repository, "gc.pruneexpire", &owned)) {
···
1779
strbuf_reset(&config_name);
1780
strbuf_addf(&config_name, "maintenance.%s.enabled",
1781
tasks[i].name);
1782
+
if (!repo_config_get_bool(the_repository, config_name.buf, &config_value))
1783
strategy.tasks[i].enabled = config_value;
1784
if (!strategy.tasks[i].enabled)
1785
continue;
+1
-1
builtin/grep.c
+1
-1
builtin/grep.c
+1
-1
builtin/rebase.c
+1
-1
builtin/rebase.c
+1
-1
compat/precompose_utf8.c
+1
-1
compat/precompose_utf8.c
-5
config.h
-5
config.h
···
719
int lookup_config(const char **mapping, int nr_mapping, const char *var);
720
721
# ifdef USE_THE_REPOSITORY_VARIABLE
722
-
static inline int git_config_get_bool(const char *key, int *dest)
723
-
{
724
-
return repo_config_get_bool(the_repository, key, dest);
725
-
}
726
-
727
static inline int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest)
728
{
729
return repo_config_get_bool_or_int(the_repository, key, is_bool, dest);
+1
-1
daemon.c
+1
-1
daemon.c
+4
-4
fetch-pack.c
+4
-4
fetch-pack.c
···
1903
{
1904
repo_config_get_int(the_repository, "fetch.unpacklimit", &fetch_unpack_limit);
1905
repo_config_get_int(the_repository, "transfer.unpacklimit", &transfer_unpack_limit);
1906
-
git_config_get_bool("repack.usedeltabaseoffset", &prefer_ofs_delta);
1907
-
git_config_get_bool("fetch.fsckobjects", &fetch_fsck_objects);
1908
-
git_config_get_bool("transfer.fsckobjects", &transfer_fsck_objects);
1909
-
git_config_get_bool("transfer.advertisesid", &advertise_sid);
1910
if (!uri_protocols.nr) {
1911
char *str;
1912
···
1903
{
1904
repo_config_get_int(the_repository, "fetch.unpacklimit", &fetch_unpack_limit);
1905
repo_config_get_int(the_repository, "transfer.unpacklimit", &transfer_unpack_limit);
1906
+
repo_config_get_bool(the_repository, "repack.usedeltabaseoffset", &prefer_ofs_delta);
1907
+
repo_config_get_bool(the_repository, "fetch.fsckobjects", &fetch_fsck_objects);
1908
+
repo_config_get_bool(the_repository, "transfer.fsckobjects", &transfer_fsck_objects);
1909
+
repo_config_get_bool(the_repository, "transfer.advertisesid", &advertise_sid);
1910
if (!uri_protocols.nr) {
1911
char *str;
1912
+2
-2
http-backend.c
+2
-2
http-backend.c
···
246
int i, value = 0;
247
struct strbuf var = STRBUF_INIT;
248
249
-
git_config_get_bool("http.getanyfile", &getanyfile);
250
repo_config_get_ulong(the_repository, "http.maxrequestbuffer", &max_request_buffer);
251
252
for (i = 0; i < ARRAY_SIZE(rpc_service); i++) {
253
struct rpc_service *svc = &rpc_service[i];
254
strbuf_addf(&var, "http.%s", svc->config_name);
255
-
if (!git_config_get_bool(var.buf, &value))
256
svc->enabled = value;
257
strbuf_reset(&var);
258
}
···
246
int i, value = 0;
247
struct strbuf var = STRBUF_INIT;
248
249
+
repo_config_get_bool(the_repository, "http.getanyfile", &getanyfile);
250
repo_config_get_ulong(the_repository, "http.maxrequestbuffer", &max_request_buffer);
251
252
for (i = 0; i < ARRAY_SIZE(rpc_service); i++) {
253
struct rpc_service *svc = &rpc_service[i];
254
strbuf_addf(&var, "http.%s", svc->config_name);
255
+
if (!repo_config_get_bool(the_repository, var.buf, &value))
256
svc->enabled = value;
257
strbuf_reset(&var);
258
}
+1
-1
merge-ort.c
+1
-1
merge-ort.c
···
5356
repo_config_get_int(the_repository, "merge.verbosity", &opt->verbosity);
5357
repo_config_get_int(the_repository, "diff.renamelimit", &opt->rename_limit);
5358
repo_config_get_int(the_repository, "merge.renamelimit", &opt->rename_limit);
5359
-
git_config_get_bool("merge.renormalize", &renormalize);
5360
opt->renormalize = renormalize;
5361
if (!repo_config_get_string(the_repository, "diff.renames", &value)) {
5362
opt->detect_renames = git_config_rename("diff.renames", value);
···
5356
repo_config_get_int(the_repository, "merge.verbosity", &opt->verbosity);
5357
repo_config_get_int(the_repository, "diff.renamelimit", &opt->rename_limit);
5358
repo_config_get_int(the_repository, "merge.renamelimit", &opt->rename_limit);
5359
+
repo_config_get_bool(the_repository, "merge.renormalize", &renormalize);
5360
opt->renormalize = renormalize;
5361
if (!repo_config_get_string(the_repository, "diff.renames", &value)) {
5362
opt->detect_renames = git_config_rename("diff.renames", value);
+2
-2
promisor-remote.c
+2
-2
promisor-remote.c
···
46
"fetch", remote_name, "--no-tags",
47
"--no-write-fetch-head", "--recurse-submodules=no",
48
"--filter=blob:none", "--stdin", NULL);
49
-
if (!git_config_get_bool("promisor.quiet", &quiet) && quiet)
50
strvec_push(&child.args, "--quiet");
51
if (start_command(&child))
52
die(_("promisor-remote: unable to fork off fetch subprocess"));
···
343
struct strvec names = STRVEC_INIT;
344
struct strvec urls = STRVEC_INIT;
345
346
-
git_config_get_bool("promisor.advertise", &advertise_promisors);
347
348
if (!advertise_promisors)
349
return NULL;
···
46
"fetch", remote_name, "--no-tags",
47
"--no-write-fetch-head", "--recurse-submodules=no",
48
"--filter=blob:none", "--stdin", NULL);
49
+
if (!repo_config_get_bool(the_repository, "promisor.quiet", &quiet) && quiet)
50
strvec_push(&child.args, "--quiet");
51
if (start_command(&child))
52
die(_("promisor-remote: unable to fork off fetch subprocess"));
···
343
struct strvec names = STRVEC_INIT;
344
struct strvec urls = STRVEC_INIT;
345
346
+
repo_config_get_bool(the_repository, "promisor.advertise", &advertise_promisors);
347
348
if (!advertise_promisors)
349
return NULL;
+2
-2
read-cache.c
+2
-2
read-cache.c
+2
-2
rerere.c
+2
-2
rerere.c
+3
-3
run-command.c
+3
-3
run-command.c
···
1817
{
1818
int enabled, auto_detach;
1819
1820
-
if (!git_config_get_bool("maintenance.auto", &enabled) &&
1821
!enabled)
1822
return 0;
1823
···
1826
* honoring `gc.autoDetach`. This is somewhat weird, but required to
1827
* retain behaviour from when we used to run git-gc(1) here.
1828
*/
1829
-
if (git_config_get_bool("maintenance.autodetach", &auto_detach) &&
1830
-
git_config_get_bool("gc.autodetach", &auto_detach))
1831
auto_detach = 1;
1832
1833
maint->git_cmd = 1;
···
1817
{
1818
int enabled, auto_detach;
1819
1820
+
if (!repo_config_get_bool(the_repository, "maintenance.auto", &enabled) &&
1821
!enabled)
1822
return 0;
1823
···
1826
* honoring `gc.autoDetach`. This is somewhat weird, but required to
1827
* retain behaviour from when we used to run git-gc(1) here.
1828
*/
1829
+
if (repo_config_get_bool(the_repository, "maintenance.autodetach", &auto_detach) &&
1830
+
repo_config_get_bool(the_repository, "gc.autodetach", &auto_detach))
1831
auto_detach = 1;
1832
1833
maint->git_cmd = 1;
+1
-1
setup.c
+1
-1
setup.c
+1
-1
t/helper/test-config.c
+1
-1
t/helper/test-config.c
+1
-1
transport.c
+1
-1
transport.c