Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Revert "excluded_1(): support exclude files in index"
author
Nguyễn Thái Ngọc Duy
<pclouds@gmail.com>
Fri, 26 Nov 2010 18:17:47 +0000
(
01:17
+0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 1 Dec 2010 01:30:28 +0000
(17:30 -0800)
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>
dir.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
9037026
)
diff --git
a/dir.c
b/dir.c
index 39eb7a3a4f9d26f2a5944f233cbe1d358a9b6440..d059aa1e6e70f48f3069759c949aac6512300de5 100644
(file)
--- 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)