config: drop `git_config_clear()` 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_clear()`. All
callsites are adjusted so that they use
`repo_config_clear(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/config.h b/config.h
index 6b729fc6bbfb2e972e4464996c9e247d2ddf4687..4eea99e9b9561bc7999ff0006a538596b7b50edc 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 void git_config_clear(void)
-{
-       repo_config_clear(the_repository);
-}
-
 static inline int git_config_get(const char *key)
 {
        return repo_config_get(the_repository, key);

diff --git a/scalar.c b/scalar.c
index 3b713abca3c289610cc6f429e62070cc6e5db36f..2aaff5aa10958512a65d25942684369a422468f5 100644 (file)
--- a/scalar.c
+++ b/scalar.c
@@ -763,7 +763,7 @@ static int cmd_reconfigure(int argc, const char **argv)
                        break;
                }
 
-               git_config_clear();
+               repo_config_clear(the_repository);
 
                if (repo_init(&r, gitdir.buf, commondir.buf))
                        goto loop_end;

diff --git a/setup.c b/setup.c
index 91a3affdd8f551ea2ba42e35c156a07dc33c5061..9661c5d5d5d7aa99157f509aba5d80971e0bd9ce 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -1741,7 +1741,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
         * configuration (including the per-repo config file that we
         * ignored previously).
         */
-       git_config_clear();
+       repo_config_clear(the_repository);
 
        /*
         * Let's assume that we are in a git repository.
@@ -2337,7 +2337,7 @@ static int create_default_files(const char *template_path,
         * disk).
         */
        copy_templates(template_path);
-       git_config_clear();
+       repo_config_clear(the_repository);
        repo_settings_reset_shared_repository(the_repository);
        repo_config(the_repository, git_default_config, NULL);