Junio C HamanoAs the point of the last change is to allow use of strings as literals no matter what characters are in them, "has_wildcard" does not match what we use this field for anymore.
It is used to decide if the wildcard matching should be used, so rename it to match the usage better.
Signed-off-by: Junio C Hamano <gitster@pobox.com> ---
* I was looking at the codepaths that would need to be touched in order to properly support the "magic pathspec" we have been discussing, and am leaning to conclude that all the users of get_pathspec() need to be rewritten to throw the remainder of argv[] at a function that fills a struct pathspec (in other words, a combination of get_pathspec() and init_pathspec()). Michael's "alternative approach to grep --full-tree" was operating at the get_pathspec() level, but that function is an interface to return an array of plain-vanilla strings only, and there is no place to hook richer per-item information on the elements. We would need "struct pathspec" in the function where we parse the argv[] and combine its elements with prefix.
In any case, pathspec.has_wildcard vs pathspec.item[i].has_wildcard was difficult to grep and find patterns, and this is an obvious fix to that problem, independent from the above observation.
builtin/ls-files.c | 2 +- builtin/ls-tree.c | 3 ++- cache.h | 2 +- dir.c | 6 +++--- tree-walk.c | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-)
Show changes to 5 files +9 −8
builtin/ls-files.c, builtin/ls-tree.c, cache.h, dir.c, tree-walk.c
diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 199af46..1570123 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -361,7 +361,7 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix) matchbuf[0] = prefix; matchbuf[1] = NULL; init_pathspec(&pathspec, matchbuf); - pathspec.items[0].has_wildcard = 0; + pathspec.items[0].use_wildcard = 0; } else init_pathspec(&pathspec, NULL); if (read_tree(tree, 1, &pathspec)) diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index 4290723..f08c5b0 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -168,7 +168,8 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix) init_pathspec(&pathspec, get_pathspec(prefix, argv + 1)); for (i = 0; i < pathspec.nr; i++) - pathspec.items[i].has_wildcard = 0; + pathspec.items[i].use_wildcard = 0; + pathspec.has_wildcard = 0; tree = parse_tree_indirect(sha1); if (!tree) die("not a tree object"); diff --git a/cache.h b/cache.h index edd5b5a..43d719d 100644 --- a/cache.h +++ b/cache.h @@ -509,7 +509,7 @@ struct pathspec { struct pathspec_item { const char *match; int len; - unsigned int has_wildcard:1; + unsigned int use_wildcard:1; } *items; }; diff --git a/dir.c b/dir.c index 168dad6..91f1502 100644 --- a/dir.c +++ b/dir.c @@ -230,7 +230,7 @@ static int match_pathspec_item(const struct pathspec_item *item, int prefix, return MATCHED_RECURSIVELY; } - if (item->has_wildcard && !fnmatch(match, name, 0)) + if (item->use_wildcard && !fnmatch(match, name, 0)) return MATCHED_FNMATCH; return 0; @@ -1286,8 +1286,8 @@ int init_pathspec(struct pathspec *pathspec, const char **paths) item->match = path; item->len = strlen(path); - item->has_wildcard = !no_wildcard(path); - if (item->has_wildcard) + item->use_wildcard = !no_wildcard(path); + if (item->use_wildcard) pathspec->has_wildcard = 1; } diff --git a/tree-walk.c b/tree-walk.c index 322becc..33f749e 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -598,7 +598,7 @@ int tree_entry_interesting(const struct name_entry *entry, &never_interesting)) return 1; - if (ps->items[i].has_wildcard) { + if (ps->items[i].use_wildcard) { if (!fnmatch(match + baselen, entry->path, 0)) return 1; @@ -614,7 +614,7 @@ int tree_entry_interesting(const struct name_entry *entry, } match_wildcards: - if (!ps->items[i].has_wildcard) + if (!ps->items[i].use_wildcard) continue; /*
-- 1.7.5.rc0.131.gfa38c
