aboutsummaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-06 22:11:16 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-06 22:11:16 -0800
commit4f43e9726af5d036af96de9e5208a6122d378f9b (patch)
treef50d3e8b91afe0ee2f45430639c2d6947d5ce651 /git-compat-util.h
parent1965f8cdbdf86930b99fd61ed2efb22ac3d6a725 (diff)
parent8f2bbe452e2c2917ec3c9a5d1593f26908cab83b (diff)
downloadgit-4f43e9726af5d036af96de9e5208a6122d378f9b.tar.gz
git-4f43e9726af5d036af96de9e5208a6122d378f9b.tar.xz
Merge branch 'jn/warn-on-inaccessible-loosen'
Deal with a situation where .config/git is a file and we notice .config/git/config is not readable due to ENOTDIR, not ENOENT. * jn/warn-on-inaccessible-loosen: config: exit on error accessing any config file doc: advertise GIT_CONFIG_NOSYSTEM config: treat user and xdg config permission problems as errors config, gitignore: failure to access with ENOTDIR is ok
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 9661bc9f7..2cecf56eb 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -654,8 +654,12 @@ int rmdir_or_warn(const char *path);
*/
int remove_or_warn(unsigned int mode, const char *path);
-/* Call access(2), but warn for any error besides ENOENT. */
+/*
+ * Call access(2), but warn for any error except "missing file"
+ * (ENOENT or ENOTDIR).
+ */
int access_or_warn(const char *path, int mode);
+int access_or_die(const char *path, int mode);
/* Warn on an inaccessible file that ought to be accessible */
void warn_on_inaccessible(const char *path);