diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-12-15 15:02:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-03 22:08:30 (GMT) |
| commit | f1a2ddbbc2df4e81e005a7e82f9e23fb6a9f95e3 (patch) | |
| tree | c17213e94f9de79a5320a52a3686019682d16af9 /tree-walk.c | |
| parent | d38f28093ef795bef13d2fda6621b4952afb42db (diff) | |
| download | git-f1a2ddbbc2df4e81e005a7e82f9e23fb6a9f95e3.zip git-f1a2ddbbc2df4e81e005a7e82f9e23fb6a9f95e3.tar.gz git-f1a2ddbbc2df4e81e005a7e82f9e23fb6a9f95e3.tar.bz2 | |
tree_entry_interesting(): optimize wildcard matching when base is matched
If base is already matched, skip that part when calling
fnmatch(). This happens quite often if users start a command from
worktree's subdirectory and prefix is usually prepended to all
pathspecs.
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.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tree-walk.c b/tree-walk.c index ae7ac1a..7596716 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -595,6 +595,20 @@ int tree_entry_interesting(const struct name_entry *entry, match + baselen, matchlen - baselen, &never_interesting)) return 1; + + if (ps->items[i].has_wildcard) { + if (!fnmatch(match + baselen, entry->path, 0)) + return 1; + + /* + * Match all directories. We'll try to + * match files later on. + */ + if (ps->recursive && S_ISDIR(entry->mode)) + return 1; + } + + continue; } match_wildcards: |