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_value()` 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_value()`. All
callsites are adjusted so that they use
`repo_config_get_value(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:25 +02:00 committed by Junio C Hamano
parent 7807051e9b
commit 2f1242567e
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/gc.c
View File

@ -114,7 +114,7 @@ static int gc_config_is_timestamp_never(const char *var)
const char *value; const char *value;
timestamp_t expire; timestamp_t expire;


if (!git_config_get_value(var, &value) && value) { if (!repo_config_get_value(the_repository, var, &value) && value) {
if (parse_expiry_date(value, &expire)) if (parse_expiry_date(value, &expire))
die(_("failed to parse '%s' value '%s'"), var, value); die(_("failed to parse '%s' value '%s'"), var, value);
return expire == 0; return expire == 0;
@ -178,7 +178,7 @@ static void gc_config(struct gc_config *cfg)
char *owned = NULL; char *owned = NULL;
unsigned long ulongval; unsigned long ulongval;


if (!git_config_get_value("gc.packrefs", &value)) { if (!repo_config_get_value(the_repository, "gc.packrefs", &value)) {
if (value && !strcmp(value, "notbare")) if (value && !strcmp(value, "notbare"))
cfg->pack_refs = -1; cfg->pack_refs = -1;
else else

6
builtin/pull.c
View File

@ -312,7 +312,7 @@ static const char *config_get_ff(void)
{ {
const char *value; const char *value;


if (git_config_get_value("pull.ff", &value)) if (repo_config_get_value(the_repository, "pull.ff", &value))
return NULL; return NULL;


switch (git_parse_maybe_bool(value)) { switch (git_parse_maybe_bool(value)) {
@ -343,7 +343,7 @@ static enum rebase_type config_get_rebase(int *rebase_unspecified)
if (curr_branch) { if (curr_branch) {
char *key = xstrfmt("branch.%s.rebase", curr_branch->name); char *key = xstrfmt("branch.%s.rebase", curr_branch->name);


if (!git_config_get_value(key, &value)) { if (!repo_config_get_value(the_repository, key, &value)) {
enum rebase_type ret = parse_config_rebase(key, value, 1); enum rebase_type ret = parse_config_rebase(key, value, 1);
free(key); free(key);
return ret; return ret;
@ -352,7 +352,7 @@ static enum rebase_type config_get_rebase(int *rebase_unspecified)
free(key); free(key);
} }


if (!git_config_get_value("pull.rebase", &value)) if (!repo_config_get_value(the_repository, "pull.rebase", &value))
return parse_config_rebase("pull.rebase", value, 1); return parse_config_rebase("pull.rebase", value, 1);


*rebase_unspecified = 1; *rebase_unspecified = 1;

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_value(const char *key, const char **value)
{
return repo_config_get_value(the_repository, key, value);
}

static inline int git_config_get_value_multi(const char *key, const struct string_list **dest) static inline int git_config_get_value_multi(const char *key, const struct string_list **dest)
{ {
return repo_config_get_value_multi(the_repository, key, dest); return repo_config_get_value_multi(the_repository, key, dest);

2
rebase-interactive.c
View File

@ -30,7 +30,7 @@ static enum missing_commit_check_level get_missing_commit_check_level(void)
{ {
const char *value; const char *value;


if (git_config_get_value("rebase.missingcommitscheck", &value) || if (repo_config_get_value(the_repository, "rebase.missingcommitscheck", &value) ||
!strcasecmp("ignore", value)) !strcasecmp("ignore", value))
return MISSING_COMMIT_CHECK_IGNORE; return MISSING_COMMIT_CHECK_IGNORE;
if (!strcasecmp("warn", value)) if (!strcasecmp("warn", value))

2
t/helper/test-config.c
View File

@ -110,7 +110,7 @@ int cmd__config(int argc, const char **argv)
fprintf(stderr, "Please, provide a command name on the command-line\n"); fprintf(stderr, "Please, provide a command name on the command-line\n");
goto exit1; goto exit1;
} else if (argc == 3 && !strcmp(argv[1], "get_value")) { } else if (argc == 3 && !strcmp(argv[1], "get_value")) {
if (!git_config_get_value(argv[2], &v)) { if (!repo_config_get_value(the_repository, argv[2], &v)) {
if (!v) if (!v)
printf("(NULL)\n"); printf("(NULL)\n");
else else