summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-22 19:56:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-22 19:56:27 (GMT)
commita3ad9a0f8d57cb0c98adc541ea1de1cc1081cf14 (patch)
tree2c55c9de25f3009667bc367f68738b10b56bcf84 /config.c
parent19f13d29a28b5b697f692b613784ff365b499081 (diff)
parente3ebc35b1695e9ac6e9b5978cd4e9ffb7b15f657 (diff)
downloadgit-a3ad9a0f8d57cb0c98adc541ea1de1cc1081cf14.zip
git-a3ad9a0f8d57cb0c98adc541ea1de1cc1081cf14.tar.gz
git-a3ad9a0f8d57cb0c98adc541ea1de1cc1081cf14.tar.bz2
Merge branch 'mm/config-xdg'
* mm/config-xdg: config: fix several access(NULL) calls
Diffstat (limited to 'config.c')
-rw-r--r--config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/config.c b/config.c
index 40818e8..2b706ea 100644
--- a/config.c
+++ b/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;
}