gitignore: report access errors of exclude files
authorJeff King <peff@peff.net>
Tue, 21 Aug 2012 06:26:07 +0000 (02:26 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Aug 2012 21:46:47 +0000 (14:46 -0700)
When we try to access gitignore files, we check for their
existence with a call to "access". We silently ignore
missing files. However, if a file is not readable, this may
be a configuration error; let's warn the user.

For $GIT_DIR/info/excludes or core.excludesfile, we can just
use access_or_warn. However, for per-directory files we
actually try to open them, so we must add a custom warning.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
dir.c

diff --git a/dir.c b/dir.c
index 240bf0c49c9654b7cef56959786613e17113c3a0..ea74048ed33b61f1f6cae2be7d3d8037353181dc 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -397,6 +397,8 @@ int add_excludes_from_file_to_list(const char *fname,
 
        fd = open(fname, O_RDONLY);
        if (fd < 0 || fstat(fd, &st) < 0) {
+               if (errno != ENOENT)
+                       warning(_("unable to access '%s': %s"), fname, strerror(errno));
                if (0 <= fd)
                        close(fd);
                if (!check_index ||
@@ -1311,9 +1313,9 @@ void setup_standard_excludes(struct dir_struct *dir)
                home_config_paths(NULL, &xdg_path, "ignore");
                excludes_file = xdg_path;
        }
-       if (!access(path, R_OK))
+       if (!access_or_warn(path, R_OK))
                add_excludes_from_file(dir, path);
-       if (excludes_file && !access(excludes_file, R_OK))
+       if (excludes_file && !access_or_warn(excludes_file, R_OK))
                add_excludes_from_file(dir, excludes_file);
 }