mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mm/config-xdg'

Browse Source 
* mm/config-xdg:
  config: fix several access(NULL) calls
This commit is contained in:
Junio C Hamano
2012-07-22 12:56:27 -07:00
parent 19f13d29a2 e3ebc35b16
commit a3ad9a0f8d
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.c
View File

@ -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;
}