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>
This commit is contained in:
committed by
Junio C Hamano
parent
4ef97dc4cd
commit
ecffa3ed51
4
config.c
4
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,
|
||||
|
||||
Reference in New Issue
Block a user