@matheusbsbs / matheus-bagliano / commits / f898661637

refs: expose peeled object ID via the iterator

Both the "files" and "reftable" backend are able to store peeled values for tags in the respective formats. This allows for a more efficient lookup of the target object of such a tag without having to manually peel via the object database. The infrastructure to access these peeled object IDs is somewhat funky though. When iterating through objects, we store a pointer reference to the current iterator in a global variable. The callbacks invoked by that iterator are then expected to call `peel_iterated_oid()`, which checks whether the globally-stored iterator's current reference refers to the one handed into that function. If so, we ask the iterator to peel the object, otherwise we manually peel the object via the object database. Depending on global state like this is somewhat weird and also quite fragile. Introduce a new `struct reference::peeled_oid` field that can be populated by the reference backends. This field can be accessed via a new function `reference_get_peeled_oid()` that either uses that value, if set, or alternatively peels via the ODB. With this change we don't have to rely on global state anymore, but make the peeled object ID available to the callback functions directly. Adjust trivial callers that already have a `struct reference` available. Remaining callers will be adjusted in subsequent commits. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Oct 23, 2025 at 09:16 UTC f89866163704528f1a6570e134853dbb99120e7c

12 files changed +48 -10

builtin/describe.c

+1 -1

@@ -208,7 +208,7 @@ static int get_name(const struct reference *ref, void *cb_data UNUSED)

208 }

209

210 /* Is it annotated? */

211 - if (!peel_iterated_oid(the_repository, ref->oid, &peeled)) {

211 + if (!reference_get_peeled_oid(the_repository, ref, &peeled)) {

212 is_annotated = !oideq(ref->oid, &peeled);

213 } else {

214 oidcpy(&peeled, ref->oid);

builtin/gc.c

+1 -1

@@ -1109,7 +1109,7 @@ static int dfs_on_ref(const struct reference *ref, void *cb_data)

1109 struct commit_list *stack = NULL;

1110 struct commit *commit;

1111

1112 - if (!peel_iterated_oid(the_repository, ref->oid, &peeled))

1112 + if (!reference_get_peeled_oid(the_repository, ref, &peeled))

1113 maybe_peeled = &peeled;

1114 if (odb_read_object_info(the_repository->objects, maybe_peeled, NULL) != OBJ_COMMIT)

1115 return 0;

builtin/pack-objects.c

+4 -3

@@ -838,7 +838,7 @@ static int mark_tagged(const struct reference *ref, void *cb_data UNUSED)

838

839 if (entry)

840 entry->tagged = 1;

841 - if (!peel_iterated_oid(the_repository, ref->oid, &peeled)) {

841 + if (!reference_get_peeled_oid(the_repository, ref, &peeled)) {

842 entry = packlist_find(&to_pack, &peeled);

843 if (entry)

844 entry->tagged = 1;

@@ -3309,7 +3309,8 @@ static int add_ref_tag(const struct reference *ref, void *cb_data UNUSED)

3309 {

3310 struct object_id peeled;

3311

3312 - if (!peel_iterated_oid(the_repository, ref->oid, &peeled) && obj_is_packed(&peeled))

3312 + if (!reference_get_peeled_oid(the_repository, ref, &peeled) &&

3313 + obj_is_packed(&peeled))

3314 add_tag_chain(ref->oid);

3315 return 0;

3316 }

@@ -4537,7 +4538,7 @@ static int mark_bitmap_preferred_tip(const struct reference *ref, void *data UNU

4538 struct object_id peeled;

4539 struct object *object;

4540

4540 - if (!peel_iterated_oid(the_repository, ref->oid, &peeled))

4541 + if (!reference_get_peeled_oid(the_repository, ref, &peeled))

4542 maybe_peeled = &peeled;

4543

4544 object = parse_object_or_die(the_repository, maybe_peeled, ref->name);

commit-graph.c

+1 -1

@@ -1857,7 +1857,7 @@ static int add_ref_to_set(const struct reference *ref, void *cb_data)

1857 struct object_id peeled;

1858 struct refs_cb_data *data = (struct refs_cb_data *)cb_data;

1859

1860 - if (!peel_iterated_oid(data->repo, ref->oid, &peeled))

1860 + if (!reference_get_peeled_oid(data->repo, ref, &peeled))

1861 maybe_peeled = &peeled;

1862 if (odb_read_object_info(data->repo->objects, maybe_peeled, NULL) == OBJ_COMMIT)

1863 oidset_insert(data->commits, maybe_peeled);

ls-refs.c

+1 -1

@@ -110,7 +110,7 @@ static int send_ref(const struct reference *ref, void *cb_data)

110

111 if (data->peel && ref->oid) {

112 struct object_id peeled;

113 - if (!peel_iterated_oid(the_repository, ref->oid, &peeled))

113 + if (!reference_get_peeled_oid(the_repository, ref, &peeled))

114 strbuf_addf(&data->buf, " peeled:%s", oid_to_hex(&peeled));

115 }

116

midx-write.c

+1 -1

@@ -709,7 +709,7 @@ static int add_ref_to_pending(const struct reference *ref, void *cb_data)

709 return 0;

710 }

711

712 - if (!peel_iterated_oid(revs->repo, ref->oid, &peeled))

712 + if (!reference_get_peeled_oid(revs->repo, ref, &peeled))

713 maybe_peeled = &peeled;

714

715 object = parse_object_or_die(revs->repo, maybe_peeled, ref->name);

pseudo-merge.c

+1 -1

@@ -230,7 +230,7 @@ static int find_pseudo_merge_group_for_ref(const struct reference *ref, void *_d

230 uint32_t i;

231 int has_bitmap;

232

233 - if (!peel_iterated_oid(the_repository, ref->oid, &peeled))

233 + if (!reference_get_peeled_oid(the_repository, ref, &peeled))

234 maybe_peeled = &peeled;

235

236 c = lookup_commit(the_repository, maybe_peeled);

refs.c

+12

@@ -2334,6 +2334,18 @@ int peel_iterated_oid(struct repository *r, const struct object_id *base, struct

2334 return peel_object(r, base, peeled) ? -1 : 0;

2335 }

2336

2337 +int reference_get_peeled_oid(struct repository *repo,

2338 + const struct reference *ref,

2339 + struct object_id *peeled_oid)

2340 +{

2341 + if (ref->peeled_oid) {

2342 + oidcpy(peeled_oid, ref->peeled_oid);

2343 + return 0;

2344 + }

2345 +

2346 + return peel_object(repo, ref->oid, peeled_oid) ? -1 : 0;

2347 +}

2348 +

2349 int refs_update_symref(struct ref_store *refs, const char *ref,

2350 const char *target, const char *logmsg)

2351 {

refs.h

+19

@@ -371,10 +371,29 @@ struct reference {

371 */

372 const struct object_id *oid;

373

374 + /*

375 + * An optional peeled object ID. This field _may_ be set for tags in

376 + * case the peeled value is present in the backend. Please refer to

377 + * `reference_get_peeled_oid()`.

378 + */

379 + const struct object_id *peeled_oid;

380 +

381 /* A bitfield of `enum reference_status` flags. */

382 unsigned flags;

383 };

384

385 +/*

386 + * Peel the tag to a non-tag commit. If present, this uses the peeled object ID

387 + * exposed by the reference backend. Otherwise, the object is peeled via the

388 + * object database, which is less efficient.

389 + *

390 + * Return `0` if the reference could be peeled, a negative error code

391 + * otherwise.

392 + */

393 +int reference_get_peeled_oid(struct repository *repo,

394 + const struct reference *ref,

395 + struct object_id *peeled_oid);

396 +

397 /*

398 * The signature for the callback function for the for_each_*()

399 * functions below. The memory pointed to by the `struct reference`

refs/packed-backend.c

@@ -963,6 +963,7 @@ static int next_record(struct packed_ref_iterator *iter)

963 iter->base.ref.flags &= ~REF_KNOWS_PEELED;

964 } else {

965 iter->base.ref.flags |= REF_KNOWS_PEELED;

966 + iter->base.ref.peeled_oid = &iter->peeled;

967 }

968 } else {

969 oidclr(&iter->peeled, iter->repo->hash_algo);

refs/reftable-backend.c

@@ -547,6 +547,7 @@ struct reftable_ref_iterator {

547 struct reftable_iterator iter;

548 struct reftable_ref_record ref;

549 struct object_id oid;

550 + struct object_id peeled_oid;

551

552 char *prefix;

553 size_t prefix_len;

@@ -671,6 +672,8 @@ static int reftable_ref_iterator_advance(struct ref_iterator *ref_iterator)

672 case REFTABLE_REF_VAL2:

673 oidread(&iter->oid, iter->ref.value.val2.value,

674 refs->base.repo->hash_algo);

675 + oidread(&iter->peeled_oid, iter->ref.value.val2.target_value,

676 + refs->base.repo->hash_algo);

677 break;

678 case REFTABLE_REF_SYMREF:

679 referent = refs_resolve_ref_unsafe(&iter->refs->base,

@@ -708,6 +711,8 @@ static int reftable_ref_iterator_advance(struct ref_iterator *ref_iterator)

711 iter->base.ref.name = iter->ref.refname;

712 iter->base.ref.target = referent;

713 iter->base.ref.oid = &iter->oid;

714 + if (iter->ref.value_type == REFTABLE_REF_VAL2)

715 + iter->base.ref.peeled_oid = &iter->peeled_oid;

716 iter->base.ref.flags = flags;

717

718 break;

repack-midx.c

+1 -1

@@ -22,7 +22,7 @@ static int midx_snapshot_ref_one(const struct reference *ref, void *_data)

22 const struct object_id *maybe_peeled = ref->oid;

23 struct object_id peeled;

25 - if (!peel_iterated_oid(data->repo, ref->oid, &peeled))

25 + if (!reference_get_peeled_oid(data->repo, ref, &peeled))

26 maybe_peeled = &peeled;

28 if (oidset_insert(&data->seen, maybe_peeled))