summaryrefslogtreecommitdiff
path: root/builtin/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-07 18:08:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-07 18:08:56 (GMT)
commit7fe136d78f5db3317ebf60115c1d7faa87412d6a (patch)
treed9f4d19d5bd01254450e6d4b169f9e30952de79e /builtin/config.c
parent09827f2a55299cc8c09d30754c016378a15c4775 (diff)
parent55b38a48e2a7ccfaaa7897a5fccb98327fa0e3c0 (diff)
downloadgit-7fe136d78f5db3317ebf60115c1d7faa87412d6a.zip
git-7fe136d78f5db3317ebf60115c1d7faa87412d6a.tar.gz
git-7fe136d78f5db3317ebf60115c1d7faa87412d6a.tar.bz2
Merge branch 'jk/config-warn-on-inaccessible-paths'
When looking for $HOME/.gitconfig etc., it is OK if we cannot read them because they do not exist, but we did not diagnose existing files that we cannot read. * jk/config-warn-on-inaccessible-paths: warn_on_inaccessible(): a helper to warn on inaccessible paths attr: warn on inaccessible attribute files gitignore: report access errors of exclude files config: warn on inaccessible files
Diffstat (limited to 'builtin/config.c')
-rw-r--r--builtin/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/config.c b/builtin/config.c
index ada6e12..442ccc2 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -400,8 +400,8 @@ int cmd_config(int argc, const char **argv, const char *prefix)
*/
die("$HOME not set");
- if (access(user_config, R_OK) &&
- xdg_config && !access(xdg_config, R_OK))
+ if (access_or_warn(user_config, R_OK) &&
+ xdg_config && !access_or_warn(xdg_config, R_OK))
given_config_file = xdg_config;
else
given_config_file = user_config;