Re: [PATCH v2 11/24] pack-bitmap.c: introduce 'nth_bitmap_object_oid()'
- From
Jeff King <peff@peff.net>
- Date
- Jul 21, 2021, 10:37 UTC
- Message-ID
- <YPf49fd7EDncfdl/@coredump.intra.peff.net>
- In-Reply-To
- <ac1f46aa1f0dbc7fba45229555b11b390fe104a0.1624314293.git.me@ttaylorr.com>
On Mon, Jun 21, 2021 at 06:25:26PM -0400, Taylor Blau wrote:
> A subsequent patch to support reading MIDX bitmaps will be less noisy > after extracting a generic function to fetch the nth OID contained in > the bitmap.
Makes sense, but...
Show 18 quoted lines
> +static void nth_bitmap_object_oid(struct bitmap_index *index,
> + struct object_id *oid,
> + uint32_t n)
> +{
> + nth_packed_object_id(oid, index->pack, n);
> +}
> +
> static int load_bitmap_entries_v1(struct bitmap_index *index)
> {
> uint32_t i;
> @@ -242,9 +249,7 @@ static int load_bitmap_entries_v1(struct bitmap_index *index)
> xor_offset = read_u8(index->map, &index->map_pos);
> flags = read_u8(index->map, &index->map_pos);
>
> - if (nth_packed_object_id(&oid, index->pack, commit_idx_pos) < 0)
> - return error("corrupt ewah bitmap: commit index %u out of range",
> - (unsigned)commit_idx_pos);
> + nth_bitmap_object_oid(index, &oid, commit_idx_pos);What happened to our error check here?
Should nth_bitmap_object_oid() be returning the value from nth_packed_object_id()?
-Peff