summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-11-27 01:17:47 +0700
committerJunio C Hamano <gitster@pobox.com>2010-11-30 17:30:28 -0800
commit9e082734b3a7c2685c1593dae8dca1e73568d51c (patch)
tree48b61ea676aff6781f171bc6d25290416a9ba405 /dir.c
parent9037026d34907c0c94e3ab46f96068fa57da6ebc (diff)
downloadgit-9e082734b3a7c2685c1593dae8dca1e73568d51c.tar.gz
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>
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/dir.c b/dir.c
index 39eb7a3a4f..d059aa1e6e 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)