Browse Source

pathspec: rename per-item field has_wildcard to use_wildcard

As 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>
maint
Junio C Hamano 14 years ago
parent
commit
33e0f62ba9
  1. 2
      builtin/ls-files.c
  2. 3
      builtin/ls-tree.c
  3. 2
      cache.h
  4. 6
      dir.c
  5. 4
      tree-walk.c

2
builtin/ls-files.c

@ -361,7 +361,7 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix) @@ -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))

3
builtin/ls-tree.c

@ -168,7 +168,8 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix) @@ -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");

2
cache.h

@ -509,7 +509,7 @@ struct pathspec { @@ -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;
};


6
dir.c

@ -230,7 +230,7 @@ static int match_pathspec_item(const struct pathspec_item *item, int prefix, @@ -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) @@ -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;
}


4
tree-walk.c

@ -598,7 +598,7 @@ int tree_entry_interesting(const struct name_entry *entry, @@ -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, @@ -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;

/*

Loading…
Cancel
Save