From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Sep 2012 22:55:41 +0000 (-0700)
Subject: Merge branch 'jk/config-warn-on-inaccessible-paths'
X-Git-Tag: v1.8.0-rc0~44
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d6fb62474ee4772ceca815122f21a4198e4f22f2?ds=inline;hp=-c

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
---

d6fb62474ee4772ceca815122f21a4198e4f22f2
diff --combined attr.c
index 3430faf2cc,056d702f6e..887a9ae46b
--- a/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;
  	}