From: Kristofer Karlsson Date: Tue, 07 Jul 2026 14:57:13 GMT Subject: Re: [PATCH 2/2] commit-graph: propagate topo_levels slab to all chain layers Message-ID: In-Reply-To: On Tue, 7 Jul 2026 at 15:49, Taylor Blau wrote: > > I think that there is a more permanent fix, though, which would have not > allowed this bug to evade both its author, and reviewer (me). I *think* > that we may clear up some scoping issues if we removed g->topo_levels > entirely, and instead stored it in the write_commit_graph_ctx struct. > > I haven't thought through the implications of doing so completely, so > it's entirely possible that this idea is bunk for some other reason. But > it was the first thing that came to mind, and so feels worth exploring > to see if it might have prevented something like this from ever > happening in the first place. > I looked into the structural change you suggested and I think it's doable, though not quite as simple as just moving it into ctx (since fill_commit_graph_info() doesn't have ctx). I found three approaches: (a) Thread topo_levels through the call chain. This would affect: - fill_commit_graph_info() - fill_commit_in_graph() - parse_commit_in_graph_one() - parse_commit_in_graph() - load_commit_graph_info() - lookup_commit_in_graph(). This is the most direct approach, but it touches many functions and some callers would need to pass in NULL which makes it a bit noisy. (b) Move topo_levels to struct object_database. Since fill_commit_graph_info() can already reach the odb via g->odb_source->odb, no signature changes are needed. The write side becomes a single assignment: ctx.r->objects->topo_levels = &topo_levels; and cleanup becomes: ctx.r->objects->topo_levels = NULL; No chain walk needed and the diff is fairly small. I am not sure about the semantics of it though -- should the odb have a reference to topo_levels? (c) Introduce a struct for the chain as a whole, separating it from the per-layer struct commit_graph. Right now struct commit_graph represents a single layer but also serves as the chain head, so chain-wide state like topo_levels gets duplicated on every layer (only logically -- the actual overhead is still small). A dedicated chain struct could own topo_levels and the linked list of layers. IMO this is the cleanest model but a larger refactoring. I have a prototype of (b) that compiles and passes the test suite. For now though, I think the minimal bugfix is the right thing to do. Thanks, Kristofer