diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-05 09:30:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-05 09:30:36 -0700 |
| commit | 33e0f62ba981ebfdcab8c9fb6d2935712a7b9d41 (patch) | |
| tree | 66e6704cb6ff05057c899819b40001d0803dfabb /builtin | |
| parent | 97d0b74a49f0c81c3f9673c1a17721ac0624c3df (diff) | |
| download | git-33e0f62ba981ebfdcab8c9fb6d2935712a7b9d41.tar.gz git-33e0f62ba981ebfdcab8c9fb6d2935712a7b9d41.tar.xz | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/ls-files.c | 2 | ||||
| -rw-r--r-- | builtin/ls-tree.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 199af4636..15701233e 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 429072339..f08c5b0c9 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"); |