From: "Kristofer Karlsson via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Taylor Blau <me@ttaylorr.com>,
Kristofer Karlsson <krka@spotify.com>,
Patrick Steinhardt <ps@pks.im>,
Kristofer Karlsson <krka@spotify.com>,
Kristofer Karlsson <krka@spotify.com>
Subject: [PATCH v2 2/2] commit-graph: propagate topo_levels slab to all chain layers
Date: Thu, 09 Jul 2026 15:03:01 +0000 [thread overview]
Message-ID: <679dd2e392b26b6a51f88b62d0a17cece71942ca.1783609382.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2170.v2.git.1783609382.gitgitgadget@gmail.com>
From: Kristofer Karlsson <krka@spotify.com>
The topo_levels slab is only propagated to the topmost graph
layer instead of all layers in the chain. Commits from lower
layers appear to have no generation numbers, so the DFS
re-walks the entire ancestry.
Fix by making topo_levels visible to all layers, not just
the first one.
Signed-off-by: Kristofer Karlsson <krka@spotify.com>
---
commit-graph.c | 2 +-
t/t5324-split-commit-graph.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/commit-graph.c b/commit-graph.c
index 702ba9731b..a0bca248ac 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -2610,7 +2610,7 @@ int write_commit_graph(struct odb_source *source,
g = prepare_commit_graph(ctx.r);
for (struct commit_graph *chain = g; chain; chain = chain->base_graph)
- g->topo_levels = &topo_levels;
+ chain->topo_levels = &topo_levels;
if (flags & COMMIT_GRAPH_WRITE_BLOOM_FILTERS)
ctx.changed_paths = 1;
diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh
index b41331e3dd..9e5ab7dbd0 100755
--- a/t/t5324-split-commit-graph.sh
+++ b/t/t5324-split-commit-graph.sh
@@ -718,7 +718,7 @@ test_expect_success 'write generation data chunk when commit-graph chain is repl
)
'
-test_expect_failure 'incremental write reads topo levels from all layers' '
+test_expect_success 'incremental write reads topo levels from all layers' '
git init topo-from-lower &&
(
cd topo-from-lower &&
--
gitgitgadget
next prev parent reply other threads:[~2026-07-09 15:03 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-07 9:59 [PATCH 0/2] commit-graph: fix topo_levels slab propagation regression Kristofer Karlsson via GitGitGadget
2026-07-07 9:59 ` [PATCH 1/2] commit-graph: add trace2 instrumentation for generation DFS Kristofer Karlsson via GitGitGadget
2026-07-07 13:46 ` Taylor Blau
2026-07-07 14:08 ` Kristofer Karlsson
2026-07-10 22:09 ` Taylor Blau
2026-07-10 22:28 ` Junio C Hamano
2026-07-10 22:56 ` Taylor Blau
2026-07-11 21:18 ` Junio C Hamano
2026-07-13 19:55 ` Kristofer Karlsson
2026-07-13 20:42 ` Junio C Hamano
2026-07-13 22:17 ` Kristofer Karlsson
2026-07-07 16:55 ` Junio C Hamano
2026-07-07 17:39 ` Kristofer Karlsson
2026-07-07 9:59 ` [PATCH 2/2] commit-graph: propagate topo_levels slab to all chain layers Kristofer Karlsson via GitGitGadget
2026-07-07 13:49 ` Taylor Blau
2026-07-07 14:02 ` Kristofer Karlsson
2026-07-07 14:57 ` Kristofer Karlsson
2026-07-10 22:14 ` Taylor Blau
2026-07-13 6:16 ` Patrick Steinhardt
2026-07-14 3:31 ` Taylor Blau
2026-07-07 17:00 ` Junio C Hamano
2026-07-07 17:42 ` Kristofer Karlsson
2026-07-07 20:13 ` Junio C Hamano
2026-07-09 13:43 ` Patrick Steinhardt
2026-07-09 15:02 ` [PATCH v2 0/2] commit-graph: fix topo_levels slab propagation regression Kristofer Karlsson via GitGitGadget
2026-07-09 15:03 ` [PATCH v2 1/2] commit-graph: add trace2 instrumentation for generation DFS Kristofer Karlsson via GitGitGadget
2026-07-09 15:03 ` Kristofer Karlsson via GitGitGadget [this message]
2026-07-10 22:15 ` [PATCH v2 0/2] commit-graph: fix topo_levels slab propagation regression Taylor Blau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=679dd2e392b26b6a51f88b62d0a17cece71942ca.1783609382.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=krka@spotify.com \
--cc=me@ttaylorr.com \
--cc=ps@pks.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.