mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'mm/config-xdg'
* mm/config-xdg: config: fix several access(NULL) calls
This commit is contained in:
commit
a3ad9a0f8d
|
@ -387,12 +387,20 @@ int cmd_config(int argc, const char **argv, const char *prefix)
|
|||
|
||||
home_config_paths(&user_config, &xdg_config, "config");
|
||||
|
||||
if (access(user_config, R_OK) && !access(xdg_config, R_OK))
|
||||
given_config_file = xdg_config;
|
||||
else if (user_config)
|
||||
given_config_file = user_config;
|
||||
else
|
||||
if (!user_config)
|
||||
/*
|
||||
* It is unknown if HOME/.gitconfig exists, so
|
||||
* we do not know if we should write to XDG
|
||||
* location; error out even if XDG_CONFIG_HOME
|
||||
* is set and points at a sane location.
|
||||
*/
|
||||
die("$HOME not set");
|
||||
|
||||
if (access(user_config, R_OK) &&
|
||||
xdg_config && !access(xdg_config, R_OK))
|
||||
given_config_file = xdg_config;
|
||||
else
|
||||
given_config_file = user_config;
|
||||
}
|
||||
else if (use_system_config)
|
||||
given_config_file = git_etc_gitconfig();
|
||||
|
|
4
config.c
4
config.c
|
@ -945,12 +945,12 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)
|
|||
found += 1;
|
||||
}
|
||||
|
||||
if (!access(xdg_config, R_OK)) {
|
||||
if (xdg_config && !access(xdg_config, R_OK)) {
|
||||
ret += git_config_from_file(fn, xdg_config, data);
|
||||
found += 1;
|
||||
}
|
||||
|
||||
if (!access(user_config, R_OK)) {
|
||||
if (user_config && !access(user_config, R_OK)) {
|
||||
ret += git_config_from_file(fn, user_config, data);
|
||||
found += 1;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue