config: rename global config function

Rename this function to a more descriptive name since we want to use the
existing name for a new function.

Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/config.c b/builtin/config.c
index 87d0dc92d99464da076bbb8d1d5e85afcd4921ab..6fff26558169e26a401ef3e02a81b2d51b3450e7 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -710,7 +710,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
        if (use_global_config) {
                char *user_config, *xdg_config;
 
-               git_global_config(&user_config, &xdg_config);
+               git_global_config_paths(&user_config, &xdg_config);
                if (!user_config)
                        /*
                         * It is unknown if HOME/.gitconfig exists, so

diff --git a/builtin/gc.c b/builtin/gc.c
index 7c11d5ebef052a46cd06b411960fb1c2b3d6ac08..c078751824c949fbb4eb7a7e9d736c79d2317f47 100644 (file)
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -1546,7 +1546,7 @@ static int maintenance_register(int argc, const char **argv, const char *prefix)
                char *user_config = NULL, *xdg_config = NULL;
 
                if (!config_file) {
-                       git_global_config(&user_config, &xdg_config);
+                       git_global_config_paths(&user_config, &xdg_config);
                        config_file = user_config;
                        if (!user_config)
                                die(_("$HOME not set"));
@@ -1614,7 +1614,7 @@ static int maintenance_unregister(int argc, const char **argv, const char *prefi
                int rc;
                char *user_config = NULL, *xdg_config = NULL;
                if (!config_file) {
-                       git_global_config(&user_config, &xdg_config);
+                       git_global_config_paths(&user_config, &xdg_config);
                        config_file = user_config;
                        if (!user_config)
                                die(_("$HOME not set"));

diff --git a/builtin/var.c b/builtin/var.c
index 8cf7dd9e2e5cef1d9238c22ed64ea07440d31528..cf5567208a277a62b872a1846919060fb6e276c3 100644 (file)
--- a/builtin/var.c
+++ b/builtin/var.c
@@ -90,7 +90,7 @@ static char *git_config_val_global(int ident_flag UNUSED)
        char *user, *xdg;
        size_t unused;
 
-       git_global_config(&user, &xdg);
+       git_global_config_paths(&user, &xdg);
        if (xdg && *xdg) {
                normalize_path_copy(xdg, xdg);
                strbuf_addf(&buf, "%s\n", xdg);

diff --git a/config.c b/config.c
index d26e16e3ce3c89993af5f3fb44182ffcc0ef33e0..ebc6a57e1c35a65dae58665ac0575387547e8b8c 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1987,7 +1987,7 @@ char *git_system_config(void)
        return system_config;
 }
 
-void git_global_config(char **user_out, char **xdg_out)
+void git_global_config_paths(char **user_out, char **xdg_out)
 {
        char *user_config = xstrdup_or_null(getenv("GIT_CONFIG_GLOBAL"));
        char *xdg_config = NULL;
@@ -2040,7 +2040,7 @@ static int do_git_config_sequence(const struct config_options *opts,
                                                         data, CONFIG_SCOPE_SYSTEM,
                                                         NULL);
 
-       git_global_config(&user_config, &xdg_config);
+       git_global_config_paths(&user_config, &xdg_config);
 
        if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK))
                ret += git_config_from_file_with_options(fn, xdg_config, data,

diff --git a/config.h b/config.h
index 14f881ecfaf6b264b6d120205ab509f2ee5930f2..e5e523553ccfea20790df73ab4a93df7ad390eb1 100644 (file)
--- a/config.h
+++ b/config.h
@@ -382,7 +382,7 @@ int config_error_nonbool(const char *);
 #endif
 
 char *git_system_config(void);
-void git_global_config(char **user, char **xdg);
+void git_global_config_paths(char **user, char **xdg);
 
 int git_config_parse_parameter(const char *, config_fn_t fn, void *data);