Merge branch 'jk/config-warn-on-inaccessible-paths'

The attribute system may be asked for a path that itself or its
leading directories no longer exists in the working tree.  Failure
to open per-directory .gitattributes with error status other than
ENOENT and ENOTDIR are diagnosed.

* jk/config-warn-on-inaccessible-paths:
attr: failure to open a .gitattributes file is OK with ENOTDIR

diff --combined attr.c
index 3430faf2ccc5e11a9c04432b7a4f13160130e141,056d702f6e244e4188abc3c8dc4db647699ec4d1..887a9ae46b7044489845abf2072339271caf2d4a
--- 1/attr.c
--- 2/attr.c
+++ b/attr.c
@@@ -306,7 -306,7 +306,7 @@@ static void free_attr_elem(struct attr_
  }
  
  static const char *builtin_attr[] = {
 -      "[attr]binary -diff -text",
 +      "[attr]binary -diff -merge -text",
        NULL,
  };
  
@@@ -353,7 -353,7 +353,7 @@@ static struct attr_stack *read_attr_fro
        int lineno = 0;
  
        if (!fp) {
-               if (errno != ENOENT)
+               if (errno != ENOENT && errno != ENOTDIR)
                        warn_on_inaccessible(path);
                return NULL;
        }