summaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-28 22:19:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-06-28 22:19:57 (GMT)
commit653111f99c6bfa3bb5effd61c138bf925f19fbdb (patch)
tree6740e5a2a55d114144461b8ccdeaf04e73548380 /dir.h
parent6f20ca3e092343ffffc22438aae25c013539d47e (diff)
parentf9f6e2ce26e25661245a6faaf0b254524c1bfbd4 (diff)
downloadgit-653111f99c6bfa3bb5effd61c138bf925f19fbdb.zip
git-653111f99c6bfa3bb5effd61c138bf925f19fbdb.tar.gz
git-653111f99c6bfa3bb5effd61c138bf925f19fbdb.tar.bz2
Merge branch 'nd/exclude-workaround-top-heavy'
Attempt to optimize matching with an exclude pattern with a deep directory hierarchy by taking the part that specifies leading path without wildcard literally.
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 6c73e41..893465a 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;