Merge commit 'v1.7.6' into jc/checkout-reflog-fix

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++)
-               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");