summaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-05 12:45:30 -0700
committerJunio C Hamano <gitster@pobox.com>2012-10-05 12:45:30 -0700
commit68bdfd7cdc634693320486c06400b60abe92302b (patch)
tree2c30985fd5933b97dfc4d1109956c72ec772be73 /dir.h
parent4742d136e2c8423ce17ccd0ccf161d9f20d49847 (diff)
parentf9f6e2ce26e25661245a6faaf0b254524c1bfbd4 (diff)
downloadgit-68bdfd7cdc634693320486c06400b60abe92302b.tar.gz
Merge commit 'f9f6e2c' into nd/attr-match-optim-more
* commit 'f9f6e2c': exclude: do strcmp as much as possible before fnmatch dir.c: get rid of the wildcard symbol set in no_wildcard() Unindent excluded_from_list()
Diffstat (limited to 'dir.h')
-rw-r--r--dir.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/dir.h b/dir.h
index 6c73e4151d..893465a1e8 100644
--- a/dir.h
+++ b/dir.h
@@ -9,7 +9,6 @@ struct dir_entry {
};
#define EXC_FLAG_NODIR 1
-#define EXC_FLAG_NOWILDCARD 2
#define EXC_FLAG_ENDSWITH 4
#define EXC_FLAG_MUSTBEDIR 8
@@ -19,6 +18,7 @@ struct exclude_list {
struct exclude {
const char *pattern;
int patternlen;
+ int nowildcardlen;
const char *base;
int baselen;
int to_exclude;