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>

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 199af46360b4d8cefc448a2384bacd083311d76c..15701233e29b240cfa1abdb56bd489306e74c677 100644 (file)
--- 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);
                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))
        } else
                init_pathspec(&pathspec, NULL);
        if (read_tree(tree, 1, &pathspec))

diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 4290723392141938c7099eaa870bd05754f41ec4..f08c5b0c942eec58b85ab41e5e5fb1ec216df683 100644 (file)
--- 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++)
 
        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");
        tree = parse_tree_indirect(sha1);
        if (!tree)
                die("not a tree object");

diff --git a/cache.h b/cache.h
index edd5b5ad8fc28440954b1066f304eab86e6a64d1..43d719d71f233c7b433f7097864a147010267e18 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -509,7 +509,7 @@ struct pathspec {
        struct pathspec_item {
                const char *match;
                int len;
        struct pathspec_item {
                const char *match;
                int len;

-               unsigned int has_wildcard:1;
+               unsigned int use_wildcard:1;

        } *items;
 };
 
        } *items;
 };
 

diff --git a/dir.c b/dir.c
index 168dad615230d77d7719101b76b50b4f6fe02777..91f1502ac6827a2f4392561d0314f41898dcfb5d 100644 (file)
--- 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;
        }
 
                        return MATCHED_RECURSIVELY;
        }
 

-       if (item->has_wildcard && !fnmatch(match, name, 0))
+       if (item->use_wildcard && !fnmatch(match, name, 0))

                return MATCHED_FNMATCH;
 
        return 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->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;
        }
 
                        pathspec->has_wildcard = 1;
        }
 

diff --git a/tree-walk.c b/tree-walk.c
index 322becc3b4ad50b8e87fae8f6d5d38f7edc51f01..33f749e1e77484694e7b8f40a65755a7818c4abb 100644 (file)
--- 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;
 
                                        &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;
 
                                if (!fnmatch(match + baselen, entry->path, 0))
                                        return 1;
 


@@ -614,7 +614,7 @@ int tree_entry_interesting(const struct name_entry *entry,
                }
 
 match_wildcards:
                }
 
 match_wildcards:

-               if (!ps->items[i].has_wildcard)
+               if (!ps->items[i].use_wildcard)

                        continue;
 
                /*
                        continue;
 
                /*