diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-11-24 11:33:50 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-11-26 11:13:13 -0800 |
commit | 8c6abbcd2720dd80b1c9b6db8104c4dcc7cba6c7 (patch) | |
tree | 9ee9ada92c4cb6bf3f8e5874d20664cf46a3e0b4 /cache.h | |
parent | 5d74762d87859d08fdf4c87ec9387e31e097acba (diff) | |
download | git-8c6abbcd2720dd80b1c9b6db8104c4dcc7cba6c7.tar.gz git-8c6abbcd2720dd80b1c9b6db8104c4dcc7cba6c7.tar.xz |
pathspec: apply "*.c" optimization from exclude
When a pattern contains only a single asterisk as wildcard,
e.g. "foo*bar", after literally comparing the leading part "foo" with
the string, we can compare the tail of the string and make sure it
matches "bar", instead of running fnmatch() on "*bar" against the
remainder of the string.
-O2 build on linux-2.6, without the patch:
$ time git rev-list --quiet HEAD -- '*.c'
real 0m40.770s
user 0m40.290s
sys 0m0.256s
With the patch
$ time ~/w/git/git rev-list --quiet HEAD -- '*.c'
real 0m34.288s
user 0m33.997s
sys 0m0.205s
The above command is not supposed to be widely popular. It's chosen
because it exercises pathspec matching a lot. The point is it cuts
down matching time for popular patterns like *.c, which could be used
as pathspec in other places.
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 'cache.h')
-rw-r--r-- | cache.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -473,6 +473,8 @@ extern int index_name_is_other(const struct index_state *, const char *, int); extern int ie_match_stat(const struct index_state *, struct cache_entry *, struct stat *, unsigned int); extern int ie_modified(const struct index_state *, struct cache_entry *, struct stat *, unsigned int); +#define PATHSPEC_ONESTAR 1 /* the pathspec pattern sastisfies GFNM_ONESTAR */ + struct pathspec { const char **raw; /* get_pathspec() result, not freed by free_pathspec() */ int nr; @@ -483,6 +485,7 @@ struct pathspec { const char *match; int len; int nowildcard_len; + int flags; } *items; }; |