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

gitster · gitster · commit d6fb62474ee4 · 2012-09-17T15:55:41.000-07:00
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 --git a/attr.c b/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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ static struct attr_stack read_attr_from_file(const char path, int macro_ok)`
`353`	`353`	`int lineno = 0;`
`354`	`354`
`355`	`355`	`if (!fp) {`
`356`		`- if (errno != ENOENT)`
	`356`	`+ if (errno != ENOENT && errno != ENOTDIR)`
`357`	`357`	`warn_on_inaccessible(path);`
`358`	`358`	`return NULL;`
`359`	`359`	`}`