diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-11-18 09:13:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-19 21:08:28 (GMT) |
| commit | 170260ae90cb6a0fec476e7d970e3ac3e81e98f5 (patch) | |
| tree | 0c342d4b08c483cf1035c1945113a96ab8057f14 /dir.c | |
| parent | f3828dc0669826660f5034a468913115675ff501 (diff) | |
| download | git-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 'dir.c')
| -rw-r--r-- | dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -230,7 +230,7 @@ static int match_pathspec_item(const struct pathspec_item *item, int prefix, return MATCHED_RECURSIVELY; } - if (item->use_wildcard && !fnmatch(match, name, 0)) + if (item->nowildcard_len < item->len && !fnmatch(match, name, 0)) return MATCHED_FNMATCH; return 0; @@ -1429,8 +1429,8 @@ int init_pathspec(struct pathspec *pathspec, const char **paths) item->match = path; item->len = strlen(path); - item->use_wildcard = !no_wildcard(path); - if (item->use_wildcard) + item->nowildcard_len = simple_length(path); + if (item->nowildcard_len < item->len) pathspec->has_wildcard = 1; } |