Merge branch 'tb/test-shell-lint'

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index b5434af0c87741f3160388cf86904c6e3f903527..4a9ee690c7dcbaaf90f9511489b8f3b7b17b3c87 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -337,7 +337,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].use_wildcard = 0;
+               pathspec.items[0].nowildcard_len = pathspec.items[0].len;
        } else
                init_pathspec(&pathspec, NULL);
        if (read_tree(tree, 1, &pathspec))