Merge branch 'jn/gitweb-docs'

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;
 
-                       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;
 
                /*