config: drop `git_config_get_string()` 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_string()`.
All callsites are adjusted so that they use
`repo_config_get_string(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/fetch.c b/builtin/fetch.c
index ea447c453d148a1069f7522f34ae2eb8bbb3cdb1..52eae4b972ddceefc36a7ea678d6a77558c1098b 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -2508,7 +2508,7 @@ int cmd_fetch(int argc,
        if (!max_jobs)
                max_jobs = online_cpus();
 
-       if (!git_config_get_string_tmp("fetch.bundleuri", &bundle_uri) &&
+       if (!repo_config_get_string_tmp(the_repository, "fetch.bundleuri", &bundle_uri) &&
            fetch_bundle_uri(the_repository, bundle_uri, NULL))
                warning(_("failed to fetch bundles from '%s'"), bundle_uri);
 

diff --git a/builtin/gc.c b/builtin/gc.c
index d8f7a1858cb22e9a858c647d56d2f274cd2c770f..a2b8fbc9f3d87c4ce5bc10ba80a9d07c12a89186 100644 (file)
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -1765,7 +1765,7 @@ static void initialize_task_config(struct maintenance_run_opts *opts,
        if (opts->schedule) {
                strategy = none_strategy;
 
-               if (!git_config_get_string_tmp("maintenance.strategy", &config_str)) {
+               if (!repo_config_get_string_tmp(the_repository, "maintenance.strategy", &config_str)) {
                        if (!strcasecmp(config_str, "incremental"))
                                strategy = incremental_strategy;
                }
@@ -1788,7 +1788,7 @@ static void initialize_task_config(struct maintenance_run_opts *opts,
                        strbuf_reset(&config_name);
                        strbuf_addf(&config_name, "maintenance.%s.schedule",
                                    tasks[i].name);
-                       if (!git_config_get_string_tmp(config_name.buf, &config_str))
+                       if (!repo_config_get_string_tmp(the_repository, config_name.buf, &config_str))
                                strategy.tasks[i].schedule = parse_schedule(config_str);
                        if (strategy.tasks[i].schedule < opts->schedule)
                                continue;

diff --git a/builtin/remote.c b/builtin/remote.c
index ebd70bea3a186da4538bf2c520cd5f0c1aec5171..826b2dcfd04a4e1deab4d9c5ebf05677eebe1903 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1268,7 +1268,7 @@ static int get_one_entry(struct remote *remote, void *priv)
 
                strbuf_addf(&promisor_config, "remote.%s.partialclonefilter", remote->name);
                strbuf_addf(&remote_info_buf, "%s (fetch)", remote->url.v[0]);
-               if (!git_config_get_string_tmp(promisor_config.buf, &partial_clone_filter))
+               if (!repo_config_get_string_tmp(the_repository, promisor_config.buf, &partial_clone_filter))
                        strbuf_addf(&remote_info_buf, " [%s]", partial_clone_filter);
 
                strbuf_release(&promisor_config);

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 18aa69f0cae6fdc922294503b8a02e4a7e90de06..d2ab31835b51ed7ce2e69e256a7a76dc85c35a04 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -496,7 +496,7 @@ static void init_submodule(const char *path, const char *prefix,
 
        /* Copy "update" setting when it is not set yet */
        strbuf_addf(&sb, "submodule.%s.update", sub->name);
-       if (git_config_get_string_tmp(sb.buf, &upd) &&
+       if (repo_config_get_string_tmp(the_repository, sb.buf, &upd) &&
            sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) {
                if (sub->update_strategy.type == SM_UPDATE_COMMAND) {
                        fprintf(stderr, _("warning: command update mode suggested for submodule '%s'\n"),
@@ -1034,7 +1034,7 @@ static void prepare_submodule_summary(struct summary_cb *info,
 
                        config_key = xstrfmt("submodule.%s.ignore",
                                             sub->name);
-                       if (!git_config_get_string_tmp(config_key, &value))
+                       if (!repo_config_get_string_tmp(the_repository, config_key, &value))
                                ignore_all = !strcmp(value, "all");
                        else if (sub->ignore)
                                ignore_all = !strcmp(sub->ignore, "all");

diff --git a/checkout.c b/checkout.c
index 0b1cf8b40b78464e5c0381f13c563ae710c2f424..1588b116eedf060ce44f76ba301c4859fa3befb3 100644 (file)
--- a/checkout.c
+++ b/checkout.c
@@ -52,7 +52,7 @@ char *unique_tracking_name(const char *name, struct object_id *oid,
 {
        struct tracking_name_data cb_data = TRACKING_NAME_DATA_INIT;
        const char *default_remote = NULL;
-       if (!git_config_get_string_tmp("checkout.defaultremote", &default_remote))
+       if (!repo_config_get_string_tmp(the_repository, "checkout.defaultremote", &default_remote))
                cb_data.default_remote = default_remote;
        cb_data.src_ref = xstrfmt("refs/heads/%s", name);
        cb_data.dst_oid = oid;

diff --git a/config.h b/config.h
index 8887ebf62eadae8f2b11d4a21ae16f7a1fad35fa..89739bee9b048f32053aa8843cf96720a44b9112 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_string_tmp(const char *key, const char **dest)
-{
-       return repo_config_get_string_tmp(the_repository, key, dest);
-}
-
 static inline int git_config_get_int(const char *key, int *dest)
 {
        return repo_config_get_int(the_repository, key, dest);

diff --git a/connect.c b/connect.c
index 4b1dc65e5cef1b35efbf6a7c0c7237c26d5863f4..34cac24d54c63873a4af029043aa22ff0ad10b0b 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -1154,7 +1154,7 @@ static const char *get_ssh_command(void)
        if ((ssh = getenv("GIT_SSH_COMMAND")))
                return ssh;
 
-       if (!git_config_get_string_tmp("core.sshcommand", &ssh))
+       if (!repo_config_get_string_tmp(the_repository, "core.sshcommand", &ssh))
                return ssh;
 
        return NULL;
@@ -1173,7 +1173,7 @@ static void override_ssh_variant(enum ssh_variant *ssh_variant)
 {
        const char *variant = getenv("GIT_SSH_VARIANT");
 
-       if (!variant && git_config_get_string_tmp("ssh.variant", &variant))
+       if (!variant && repo_config_get_string_tmp(the_repository, "ssh.variant", &variant))
                return;
 
        if (!strcmp(variant, "auto"))

diff --git a/editor.c b/editor.c
index b79d97b0e721c239772bf70397ac98426c155e52..fd174e6a034f1cb989a860dc3b7d39ca489e53e8 100644 (file)
--- a/editor.c
+++ b/editor.c
@@ -50,7 +50,7 @@ const char *git_sequence_editor(void)
        const char *editor = getenv("GIT_SEQUENCE_EDITOR");
 
        if (!editor)
-               git_config_get_string_tmp("sequence.editor", &editor);
+               repo_config_get_string_tmp(the_repository, "sequence.editor", &editor);
        if (!editor)
                editor = git_editor();
 

diff --git a/help.c b/help.c
index db62cda44426e6a583be208dede8bcd0f5261f59..bb20498cfd0f15bf4b05f03f1e3b5a23ae84bbc5 100644 (file)
--- a/help.c
+++ b/help.c
@@ -417,7 +417,7 @@ void list_cmds_by_config(struct string_list *list)
 {
        const char *cmd_list;
 
-       if (git_config_get_string_tmp("completion.commands", &cmd_list))
+       if (repo_config_get_string_tmp(the_repository, "completion.commands", &cmd_list))
                return;
 
        string_list_sort(list);

diff --git a/promisor-remote.c b/promisor-remote.c
index be6f82d12f847a64756bee4b1e120a92580b4bb8..a9c877d9cfa30f77357b53c9f8bdca2e9f8efda8 100644 (file)
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -327,7 +327,7 @@ static void promisor_info_vecs(struct repository *repo,
                char *url_key = xstrfmt("remote.%s.url", r->name);
 
                /* Only add remotes with a non empty URL */
-               if (!git_config_get_string_tmp(url_key, &url) && *url) {
+               if (!repo_config_get_string_tmp(the_repository, url_key, &url) && *url) {
                        strvec_push(names, r->name);
                        strvec_push(urls, url);
                }
@@ -433,7 +433,7 @@ static void filter_promisor_remote(struct repository *repo,
        struct strvec names = STRVEC_INIT;
        struct strvec urls = STRVEC_INIT;
 
-       if (!git_config_get_string_tmp("promisor.acceptfromserver", &accept_str)) {
+       if (!repo_config_get_string_tmp(the_repository, "promisor.acceptfromserver", &accept_str)) {
                if (!*accept_str || !strcasecmp("None", accept_str))
                        accept = ACCEPT_NONE;
                else if (!strcasecmp("KnownUrl", accept_str))

diff --git a/protocol.c b/protocol.c
index bae7226ff4074f1f37a350bc4c901156af19bf27..65f66217021609dccbbb0c416d8cb3b9b30e8c6d 100644 (file)
--- a/protocol.c
+++ b/protocol.c
@@ -24,7 +24,7 @@ enum protocol_version get_protocol_version_config(void)
        const char *git_test_k = "GIT_TEST_PROTOCOL_VERSION";
        const char *git_test_v;
 
-       if (!git_config_get_string_tmp("protocol.version", &value)) {
+       if (!repo_config_get_string_tmp(the_repository, "protocol.version", &value)) {
                enum protocol_version version = parse_protocol_version(value);
 
                if (version == protocol_unknown_version)

diff --git a/remote.c b/remote.c
index e965f022f12b78784964d4940615b1e9cf35a0e4..88f991795b2683cd5267c7bd24d374fc473b0184 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -734,7 +734,7 @@ static void validate_remote_url(struct remote *remote)
        struct strbuf redacted = STRBUF_INIT;
        int warn_not_die;
 
-       if (git_config_get_string_tmp("transfer.credentialsinurl", &value))
+       if (repo_config_get_string_tmp(the_repository, "transfer.credentialsinurl", &value))
                return;
 
        if (!strcmp("warn", value))

diff --git a/sideband.c b/sideband.c
index 251e9615ed0239d77556d4ff92fe5570f083d6fe..8f15b98a65444f479fa68f75b0a8e6c1ccb95013 100644 (file)
--- a/sideband.c
+++ b/sideband.c
@@ -39,9 +39,9 @@ static int use_sideband_colors(void)
        if (use_sideband_colors_cached >= 0)
                return use_sideband_colors_cached;
 
-       if (!git_config_get_string_tmp(key, &value))
+       if (!repo_config_get_string_tmp(the_repository, key, &value))
                use_sideband_colors_cached = git_config_colorbool(key, value);
-       else if (!git_config_get_string_tmp("color.ui", &value))
+       else if (!repo_config_get_string_tmp(the_repository, "color.ui", &value))
                use_sideband_colors_cached = git_config_colorbool("color.ui", value);
        else
                use_sideband_colors_cached = GIT_COLOR_AUTO;
@@ -49,7 +49,7 @@ static int use_sideband_colors(void)
        for (i = 0; i < ARRAY_SIZE(keywords); i++) {
                strbuf_reset(&sb);
                strbuf_addf(&sb, "%s.%s", key, keywords[i].keyword);
-               if (git_config_get_string_tmp(sb.buf, &value))
+               if (repo_config_get_string_tmp(the_repository, sb.buf, &value))
                        continue;
                color_parse(value, keywords[i].color);
        }

diff --git a/t/helper/test-config.c b/t/helper/test-config.c
index 1953ab846e455a05e81e9adf7671e5855b96ea3c..30e70f1a6c2310aba21a8cae769dbf4f9e19ae8e 100644 (file)
--- a/t/helper/test-config.c
+++ b/t/helper/test-config.c
@@ -171,7 +171,7 @@ int cmd__config(int argc, const char **argv)
                        goto exit1;
                }
        } else if (argc == 3 && !strcmp(argv[1], "get_string")) {
-               if (!git_config_get_string_tmp(argv[2], &v)) {
+               if (!repo_config_get_string_tmp(the_repository, argv[2], &v)) {
                        printf("%s\n", v);
                        goto exit0;
                } else {