Merge branch 'maint'

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);
-               pathspec.items[0].has_wildcard = 0;
+               pathspec.items[0].use_wildcard = 0;
        } else
                init_pathspec(&pathspec, NULL);
        if (read_tree(tree, 1, &pathspec))