From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Fri, 26 Nov 2010 18:17:47 +0000 (+0700)
Subject: Revert "excluded_1(): support exclude files in index"
X-Git-Tag: v1.7.4-rc0~12^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9e082734b3a7c2685c1593dae8dca1e73568d51c;p=git.git

Revert "excluded_1(): support exclude files in index"

This reverts commit c84de70781674a35b9bfd20aa5bc8c47582615df.
The commit provided a workaround for matching directories in
index. But it is no longer needed.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/dir.c b/dir.c
index 39eb7a3a4..d059aa1e6 100644
--- a/dir.c
+++ b/dir.c
@@ -371,13 +371,6 @@ int excluded_from_list(const char *pathname,
 			int to_exclude = x->to_exclude;
 
 			if (x->flags & EXC_FLAG_MUSTBEDIR) {
-				if (!dtype) {
-					if (!prefixcmp(pathname, exclude) &&
-					    pathname[x->patternlen] == '/')
-						return to_exclude;
-					else
-						continue;
-				}
 				if (*dtype == DT_UNKNOWN)
 					*dtype = get_dtype(NULL, pathname, pathlen);
 				if (*dtype != DT_DIR)