Skip to content

Commit d54eb12

Browse files
rscharfegitster
authored andcommitted
delta-islands: use repo_parse_tree()
19be71d (delta-islands: stop depending on `the_repository`, 2025-03-10) replaced explicit uses of the_repository. parse_tree() uses it internally, though, so call repo_parse_tree() instead and hand it the correct repository. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 83131ed commit d54eb12

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

delta-islands.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ void resolve_tree_islands(struct repository *r,
283283
root_marks = kh_value(island_marks, pos);
284284

285285
tree = lookup_tree(r, &ent->idx.oid);
286-
if (!tree || parse_tree(tree) < 0)
286+
if (!tree || repo_parse_tree(r, tree) < 0)
287287
die(_("bad tree object %s"), oid_to_hex(&ent->idx.oid));
288288

289289
init_tree_desc(&desc, &tree->object.oid, tree->buffer, tree->size);

0 commit comments

Comments
 (0)