undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: unify code paths to get global config paths

Browse Source 
There's two callsites which assemble global config paths, once in the
config loading code and once in the git-config(1) builtin. We're about
to implement a way to override global config paths via an environment
variable which would require us to adjust both sites.

Unify both code paths into a single `git_global_config()` function which
returns both paths for `~/.gitconfig` and the XDG config file. This will
make the subsequent patch which introduces the new envvar easier to
implement.

No functional changes are expected from this patch.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt 2021-04-19 14:31:12 +02:00 committed by Junio C Hamano
parent c62a999c6e
commit 1e06eb9b5d
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/config.c
View File

@ -671,9 +671,9 @@ int cmd_config(int argc, const char **argv, const char *prefix)
} }
if (use_global_config) { if (use_global_config) {
char *user_config = expand_user_path("~/.gitconfig", 0); char *user_config, *xdg_config;
char *xdg_config = xdg_config_home("config");
git_global_config(&user_config, &xdg_config);
if (!user_config) if (!user_config)
/* /*
* It is unknown if HOME/.gitconfig exists, so * It is unknown if HOME/.gitconfig exists, so

12
config.c
View File

@ -1849,6 +1849,12 @@ char *git_system_config(void)
return system_path(ETC_GITCONFIG); return system_path(ETC_GITCONFIG);
} }
void git_global_config(char **user_config, char **xdg_config)
{
*user_config = expand_user_path("~/.gitconfig", 0);
*xdg_config = xdg_config_home("config");
}
/* /*
* Parse environment variable 'k' as a boolean (in various * Parse environment variable 'k' as a boolean (in various
* possible spellings); if missing, use the default value 'def'. * possible spellings); if missing, use the default value 'def'.
@ -1881,8 +1887,8 @@ static int do_git_config_sequence(const struct config_options *opts,
{ {
int ret = 0; int ret = 0;
char *system_config = git_system_config(); char *system_config = git_system_config();
char *xdg_config = xdg_config_home("config"); char *xdg_config = NULL;
char *user_config = expand_user_path("~/.gitconfig", 0); char *user_config = NULL;
char *repo_config; char *repo_config;
enum config_scope prev_parsing_scope = current_parsing_scope; enum config_scope prev_parsing_scope = current_parsing_scope;
@ -1900,6 +1906,8 @@ static int do_git_config_sequence(const struct config_options *opts,
ret += git_config_from_file(fn, system_config, data); ret += git_config_from_file(fn, system_config, data);
current_parsing_scope = CONFIG_SCOPE_GLOBAL; current_parsing_scope = CONFIG_SCOPE_GLOBAL;
git_global_config(&user_config, &xdg_config);
if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK)) if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK))
ret += git_config_from_file(fn, xdg_config, data); ret += git_config_from_file(fn, xdg_config, data);

1
config.h
View File

@ -327,6 +327,7 @@ int config_error_nonbool(const char *);
#endif #endif
char *git_system_config(void); char *git_system_config(void);
void git_global_config(char **user, char **xdg);
int git_config_parse_parameter(const char *, config_fn_t fn, void *data); int git_config_parse_parameter(const char *, config_fn_t fn, void *data);