[PATCH v2 12/20] retry_bad_packed_offset(): convert to new revindex API
flat view
STALE2091d
From: Taylor Blau <hidden>
Date: 2021-01-14 02:06:31
Subsystem:
the rest · Maintainer:
Linus Torvalds
Perform exactly the same conversion as in the previous commit to another caller within 'packfile.c'. Signed-off-by: Taylor Blau <redacted> --- packfile.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/packfile.c b/packfile.c
index 3e3f391949..7c37f9ec5c 100644
--- a/packfile.c
+++ b/packfile.c@@ -1256,12 +1256,11 @@ static int retry_bad_packed_offset(struct repository *r, off_t obj_offset) { int type; - struct revindex_entry *revidx; + uint32_t pos; struct object_id oid; - revidx = find_pack_revindex(p, obj_offset); - if (!revidx) + if (offset_to_pack_pos(p, obj_offset, &pos) < 0) return OBJ_BAD; - nth_packed_object_id(&oid, p, revidx->nr); + nth_packed_object_id(&oid, p, pack_pos_to_index(p, pos)); mark_bad_packed_object(p, oid.hash); type = oid_object_info(r, &oid, NULL); if (type <= OBJ_NONE)
--
2.30.0.138.g6d7191ea01