@matheusbsbs / matheus-bagliano / commits / e5c52c9898

config, gitignore: failure to access with ENOTDIR is ok

The access_or_warn() function is used to check for optional configuration files like .gitconfig and .gitignore and warn when they are not accessible due to a configuration issue (e.g., bad permissions). It is not supposed to complain when a file is simply missing. Noticed on a system where ~/.config/git was a file --- when the new XDG_CONFIG_HOME support looks for ~/.config/git/config it should ignore ~/.config/git instead of printing irritating warnings: $ git status -s warning: unable to access '/home/jrn/.config/git/config': Not a directory warning: unable to access '/home/jrn/.config/git/config': Not a directory warning: unable to access '/home/jrn/.config/git/config': Not a directory warning: unable to access '/home/jrn/.config/git/config': Not a directory Compare v1.7.12.1~2^2 (attr:failure to open a .gitattributes file is OK with ENOTDIR, 2012-09-13). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jonathan Nieder committed Oct 13, 2012 at 17:03 UTC e5c52c9898de5f829317729afc0416825531b0d5

2 files changed +5 -2

git-compat-util.h

+4 -1

@@ -604,7 +604,10 @@ int rmdir_or_warn(const char *path);

604 */

605 int remove_or_warn(unsigned int mode, const char *path);

606

607 -/* Call access(2), but warn for any error besides ENOENT. */

607 +/*

608 + * Call access(2), but warn for any error except "missing file"

609 + * (ENOENT or ENOTDIR).

610 + */

611 int access_or_warn(const char *path, int mode);

612

613 /* Warn on an inaccessible file that ought to be accessible */

wrapper.c

+1 -1

@@ -411,7 +411,7 @@ void warn_on_inaccessible(const char *path)

411 int access_or_warn(const char *path, int mode)

412 {

413 int ret = access(path, mode);

414 - if (ret && errno != ENOENT)

414 + if (ret && errno != ENOENT && errno != ENOTDIR)

415 warn_on_inaccessible(path);

416 return ret;

417 }