diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-22 12:56:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-22 12:56:27 -0700 |
| commit | a3ad9a0f8d57cb0c98adc541ea1de1cc1081cf14 (patch) | |
| tree | 2c55c9de25f3009667bc367f68738b10b56bcf84 /config.c | |
| parent | Merge branch 'as/t4012-style-updates' (diff) | |
| parent | config: fix several access(NULL) calls (diff) | |
| download | tgif-a3ad9a0f8d57cb0c98adc541ea1de1cc1081cf14.tar.xz | |
Merge branch 'mm/config-xdg'
* mm/config-xdg:
config: fix several access(NULL) calls
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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; } |