diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-18 17:47:57 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-19 10:50:33 +0900 |
| commit | 67022e02145b3be774febf38e9dc228ed11e6f25 (patch) | |
| tree | c241ae71cd24dce3dbed93d0e5176c583bb77bf7 /list-objects.c | |
| parent | e092073d643b17c82d72cf692fbfaea9c9796f11 (diff) | |
| download | git-67022e02145b3be774febf38e9dc228ed11e6f25.tar.gz git-67022e02145b3be774febf38e9dc228ed11e6f25.tar.xz | |
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 <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'list-objects.c')
| -rw-r--r-- | list-objects.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/list-objects.c b/list-objects.c index c41cc80db..63c395d9c 100644 --- a/list-objects.c +++ b/list-objects.c @@ -113,7 +113,8 @@ static void process_tree_contents(struct traversal_context *ctx, while (tree_entry(&desc, &entry)) { if (match != all_entries_interesting) { - match = tree_entry_interesting(&entry, base, 0, + match = tree_entry_interesting(ctx->revs->repo->index, + &entry, base, 0, &ctx->revs->diffopt.pathspec); if (match == all_entries_not_interesting) break; |