summaryrefslogtreecommitdiff
path: root/tree-walk.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-12-15 22:02:47 +0700
committerJunio C Hamano <gitster@pobox.com>2011-02-03 14:08:30 -0800
commitf1a2ddbbc2df4e81e005a7e82f9e23fb6a9f95e3 (patch)
treec17213e94f9de79a5320a52a3686019682d16af9 /tree-walk.c
parentd38f28093ef795bef13d2fda6621b4952afb42db (diff)
downloadgit-f1a2ddbbc2df4e81e005a7e82f9e23fb6a9f95e3.tar.gz
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.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/tree-walk.c b/tree-walk.c
index ae7ac1a9f2..7596716cf0 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: