Re: [PATCH 2/2] commit-graph: propagate topo_levels slab to all chain layers
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Jul 9, 2026, 13:43 UTC
- Message-ID
- <ak-ljlV33GLigFf6@pks.im>
- In-Reply-To
- <f9c1482a76493520b948a2e918de7a5481fa1043.1783418384.git.gitgitgadget@gmail.com>
On Tue, Jul 07, 2026 at 09:59:43AM +0000, Kristofer Karlsson via GitGitGadget wrote:
Show 13 quoted lines
> diff --git a/commit-graph.c b/commit-graph.c > index 4e39a048c4..c2a711cceb 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;
Oops, that's an embarrassing bug indeed. Thanks for finding and fixing it!
Show 16 quoted lines
> diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh > index f9c57760f4..9e5ab7dbd0 100755 > --- a/t/t5324-split-commit-graph.sh > +++ b/t/t5324-split-commit-graph.sh > @@ -738,11 +738,7 @@ test_expect_success 'incremental write reads topo levels from all layers' ' > GIT_TRACE2_EVENT="$(pwd)/trace.txt" \ > git commit-graph write --reachable --split=no-merge && > > - # BUG: topo levels from lower graph layers are not > - # propagated, so the DFS re-walks from base-3 down to > - # the root (7 steps) instead of reading topo levels > - # from the existing graph (1 step). > - test_trace2_data commit-graph generation-dfs-steps 7 <trace.txt > + test_trace2_data commit-graph generation-dfs-steps 1 <trace.txt > ) > '
Makes sense.
Patrick