path: root/tree-diff.c
diff options
authorNguyễn Thái Ngọc Duy <>2018-11-18 16:47:57 (GMT)
committerJunio C Hamano <>2018-11-19 01:50:33 (GMT)
commit67022e02145b3be774febf38e9dc228ed11e6f25 (patch)
treec241ae71cd24dce3dbed93d0e5176c583bb77bf7 /tree-diff.c
parente092073d643b17c82d72cf692fbfaea9c9796f11 (diff)
tree-walk.c: make tree_entry_interesting() take an index
In order to support :(attr) when matching pathspec on a tree, tree_entry_interesting() needs to take an index (because git_check_attr() needs it). This is the preparation step for it. This also makes it clearer what index we fall back to when looking up attributes during an unpack-trees operation: the source index. This also fixes revs->pruning.repo initialization that should have been done in 2abf350385 (revision.c: remove implicit dependency on the_index - 2018-09-21). Without it, skip_uninteresting() will dereference a NULL pointer through this call chain get_revision(revs) get_revision_internal get_revision_1 try_to_simplify_commit rev_compare_tree diff_tree_oid(..., &revs->pruning) ll_diff_tree_oid diff_tree_paths ll_diff_tree skip_uninteresting Signed-off-by: Nguyễn Thái Ngọc Duy <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'tree-diff.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/tree-diff.c b/tree-diff.c
index 0e54324..34ee3b1 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -299,7 +299,8 @@ static void skip_uninteresting(struct tree_desc *t, struct strbuf *base,
enum interesting match;
while (t->size) {
- match = tree_entry_interesting(&t->entry, base, 0, &opt->pathspec);
+ match = tree_entry_interesting(opt->repo->index, &t->entry,
+ base, 0, &opt->pathspec);
if (match) {
if (match == all_entries_not_interesting)
t->size = 0;