config: drop `git_config_get_value()` 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_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>

diff --git a/builtin/gc.c b/builtin/gc.c
index e5c3d082edaed55ef1fb4e3e8affe3010ddf818a..e94931ff48f08c9680ec859749c12d390cb7891b 100644 (file)
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -114,7 +114,7 @@ static int gc_config_is_timestamp_never(const char *var)
        const char *value;
        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))
                        die(_("failed to parse '%s' value '%s'"), var, value);
                return expire == 0;
@@ -178,7 +178,7 @@ static void gc_config(struct gc_config *cfg)
        char *owned = NULL;
        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"))
                        cfg->pack_refs = -1;
                else

diff --git a/builtin/pull.c b/builtin/pull.c
index d13ed9b5176c24e554c1c264270a6ccfaa65d813..5ea51c31f5878b40d886afe0c7a8d4f200adfc97 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -312,7 +312,7 @@ static const char *config_get_ff(void)
 {
        const char *value;
 
-       if (git_config_get_value("pull.ff", &value))
+       if (repo_config_get_value(the_repository, "pull.ff", &value))
                return NULL;
 
        switch (git_parse_maybe_bool(value)) {
@@ -343,7 +343,7 @@ static enum rebase_type config_get_rebase(int *rebase_unspecified)
        if (curr_branch) {
                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);
                        free(key);
                        return ret;
@@ -352,7 +352,7 @@ static enum rebase_type config_get_rebase(int *rebase_unspecified)
                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);
 
        *rebase_unspecified = 1;

diff --git a/config.h b/config.h
index 9261ed0f8d7f058ea38acd5ab1f9d43652341c79..5dc330b88b1ab9e1e5b7f8b0b3570c692f62cd09 100644 (file)
--- a/config.h
+++ b/config.h
@@ -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);
 
 # 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)
 {
        return repo_config_get_value_multi(the_repository, key, dest);

diff --git a/rebase-interactive.c b/rebase-interactive.c
index cbeb864147710696805e905e031bbfac2f73efe0..809f76a87b8c77542c61e032aa69bca217a02d86 100644 (file)
--- a/rebase-interactive.c
+++ b/rebase-interactive.c
@@ -30,7 +30,7 @@ static enum missing_commit_check_level get_missing_commit_check_level(void)
 {
        const char *value;
 
-       if (git_config_get_value("rebase.missingcommitscheck", &value) ||
+       if (repo_config_get_value(the_repository, "rebase.missingcommitscheck", &value) ||
                        !strcasecmp("ignore", value))
                return MISSING_COMMIT_CHECK_IGNORE;
        if (!strcasecmp("warn", value))

diff --git a/t/helper/test-config.c b/t/helper/test-config.c
index cacf6f306b1484b90b9cb8137f692a04118d5f4a..99c91512173dfd9a06c912227f7fc3018bd9963b 100644 (file)
--- a/t/helper/test-config.c
+++ b/t/helper/test-config.c
@@ -110,7 +110,7 @@ int cmd__config(int argc, const char **argv)
                fprintf(stderr, "Please, provide a command name on the command-line\n");
                goto exit1;
        } 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)
                                printf("(NULL)\n");
                        else