summaryrefslogtreecommitdiff
path: root/tree-walk.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2012-11-18 09:13:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-11-19 21:08:28 (GMT)
commit170260ae90cb6a0fec476e7d970e3ac3e81e98f5 (patch)
tree0c342d4b08c483cf1035c1945113a96ab8057f14 /tree-walk.c
parentf3828dc0669826660f5034a468913115675ff501 (diff)
downloadgit-170260ae90cb6a0fec476e7d970e3ac3e81e98f5.zip
git-170260ae90cb6a0fec476e7d970e3ac3e81e98f5.tar.gz
git-170260ae90cb6a0fec476e7d970e3ac3e81e98f5.tar.bz2
pathspec: save the non-wildcard length part
We mark pathspec with wildcards with the field use_wildcard. We could do better by saving the length of the non-wildcard part, which can be used for optimizations such as f9f6e2c (exclude: do strcmp as much as possible before fnmatch - 2012-06-07). 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 'tree-walk.c')
-rw-r--r--tree-walk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tree-walk.c b/tree-walk.c
index 3f54c02..af871c5 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -626,7 +626,7 @@ enum interesting tree_entry_interesting(const struct name_entry *entry,
&never_interesting))
return entry_interesting;
- if (item->use_wildcard) {
+ if (item->nowildcard_len < item->len) {
if (!fnmatch(match + baselen, entry->path, 0))
return entry_interesting;
@@ -642,7 +642,7 @@ enum interesting tree_entry_interesting(const struct name_entry *entry,
}
match_wildcards:
- if (!item->use_wildcard)
+ if (item->nowildcard_len == item->len)
continue;
/*