aboutsummaryrefslogtreecommitdiffstats
path: root/refs/debug.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-11-04 07:31:26 -0800
committerJunio C Hamano <gitster@pobox.com>2025-11-04 07:31:26 -0800
commit8c6e6b27379b98269620f5f20397425ba358a1bb (patch)
treef5c35ea7c977e5ee3df8a3cbfb4b29a732d66e1a /refs/debug.c
parentRevert "Merge branch 'kn/refs-optim-cleanup' into next" (diff)
downloadgit-8c6e6b27379b98269620f5f20397425ba358a1bb.tar.gz
git-8c6e6b27379b98269620f5f20397425ba358a1bb.zip
Revert "Merge branch 'ps/ref-peeled-tags' into next"
This reverts commit 8ac48a10de61267858d66383c34833e55a5e9d02, reversing changes made to 9ab444edfb825dfbc555b3d7916df03071db94c3.
Diffstat (limited to 'refs/debug.c')
-rw-r--r--refs/debug.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/refs/debug.c b/refs/debug.c
index f38991c02a..c59c1728a3 100644
--- a/refs/debug.c
+++ b/refs/debug.c
@@ -168,9 +168,11 @@ static int debug_ref_iterator_advance(struct ref_iterator *ref_iterator)
trace_printf_key(&trace_refs, "iterator_advance: (%d)\n", res);
else
trace_printf_key(&trace_refs, "iterator_advance: %s (0)\n",
- diter->iter->ref.name);
+ diter->iter->refname);
- diter->base.ref = diter->iter->ref;
+ diter->base.refname = diter->iter->refname;
+ diter->base.oid = diter->iter->oid;
+ diter->base.flags = diter->iter->flags;
return res;
}
@@ -185,6 +187,16 @@ static int debug_ref_iterator_seek(struct ref_iterator *ref_iterator,
return res;
}
+static int debug_ref_iterator_peel(struct ref_iterator *ref_iterator,
+ struct object_id *peeled)
+{
+ struct debug_ref_iterator *diter =
+ (struct debug_ref_iterator *)ref_iterator;
+ int res = diter->iter->vtable->peel(diter->iter, peeled);
+ trace_printf_key(&trace_refs, "iterator_peel: %s: %d\n", diter->iter->refname, res);
+ return res;
+}
+
static void debug_ref_iterator_release(struct ref_iterator *ref_iterator)
{
struct debug_ref_iterator *diter =
@@ -196,6 +208,7 @@ static void debug_ref_iterator_release(struct ref_iterator *ref_iterator)
static struct ref_iterator_vtable debug_ref_iterator_vtable = {
.advance = debug_ref_iterator_advance,
.seek = debug_ref_iterator_seek,
+ .peel = debug_ref_iterator_peel,
.release = debug_ref_iterator_release,
};