Skip to content
Browse files

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
  • Loading branch information...
2 parents d6e32f6 + 8e950da commit d6fb62474ee4772ceca815122f21a4198e4f22f2 @gitster gitster committed Sep 17, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 attr.c
View
2 attr.c
@@ -353,7 +353,7 @@ static struct attr_stack *read_attr_from_file(const char *path, int macro_ok)
int lineno = 0;
if (!fp) {
- if (errno != ENOENT)
+ if (errno != ENOENT && errno != ENOTDIR)
warn_on_inaccessible(path);
return NULL;
}

0 comments on commit d6fb624

Please sign in to comment.
Something went wrong with that request. Please try again.