Merge branch 'nd/attr-pathspec-in-tree-walk'

diff --git a/builtin/grep.c b/builtin/grep.c
index bad9c0a3d5134a69d9388e169793b03c9952d9bf..4748195ae173786924f75dab9e865ce05b434930 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -553,7 +553,8 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
 
                if (match != all_entries_interesting) {
                        strbuf_addstr(&name, base->buf + tn_len);
-                       match = tree_entry_interesting(&entry, &name,
+                       match = tree_entry_interesting(repo->index,
+                                                      &entry, &name,
                                                       0, pathspec);
                        strbuf_setlen(&name, name_base_len);