[PATCH 02/12] commit-graph: simplify reading a single commit graph
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Nov 16, 2026, 13:07 UTC
- Message-ID
- <20261116-pks-odb-pluggable-commit-graphs-v1-2-a83fc1ff0808@pks.im>
- In-Reply-To
- <20261116-pks-odb-pluggable-commit-graphs-v1-0-a83fc1ff0808@pks.im>
In a subsequent commit we're about to move the logic to locate commit graphs and commit graph chains into the object database backend. With that change, the responsibility of the commit-graph subsystem changes so that it only provides the functionality to read and write commit graphs, whereas the backend owns the locations those are read from and written to.
The function `load_commit_graph_one_fd_st()` is responsible for loading a single commit graph layer from disk. It receives as input the file descriptor and the directory it is being read from. While the former makes sense, the latter doesn't: we already populate the graph's file name in `load_commit_graph_one()`, so we populate paths in two different locations.
Besides that, the actual paths are about to become a responsibility of the backend. So arguably, generic functionality that loads the commit graph should not be exposed to it.
Stop passing the directory path and instead populate it in `load_commit_graph_one()`, which will later on be moved into the "files" backend. While at it, rename `load_commit_graph_one_fd_st()` to `commit_graph_read()`.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- builtin/commit-graph.c | 2 +- commit-graph.c | 15 +++++++-------- commit-graph.h | 12 +++++------- 3 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 8194a528406..2a5a75dc22f 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -111,7 +111,7 @@ static int cmd_commit_graph_verify(int argc, if (opened == OPENED_NONE) return 0; else if (opened == OPENED_GRAPH) - graph = load_commit_graph_one_fd_st(repo, dir->abspath, fd, &st); + graph = commit_graph_read(repo, fd, &st); else graph = load_commit_graph_chain_fd_st(repo->objects, fd, &st, &incomplete_chain); diff --git a/commit-graph.c b/commit-graph.c index 94c761907a0..c427a6f90f7 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -257,9 +257,8 @@ int open_commit_graph(const char *graph_file, int *fd, struct stat *st) return 1; } -struct commit_graph *load_commit_graph_one_fd_st(struct repository *repo, - const char *dir, - int fd, struct stat *st) +struct commit_graph *commit_graph_read(struct repository *repo, + int fd, struct stat *st) { void *graph_map; size_t graph_size; @@ -276,9 +275,7 @@ struct commit_graph *load_commit_graph_one_fd_st(struct repository *repo, close(fd); ret = commit_graph_parse(repo, graph_map, graph_size); - if (ret) - ret->dir = absolute_pathdup(dir); - else + if (!ret) munmap(graph_map, graph_size); return ret; @@ -508,9 +505,11 @@ static struct commit_graph *load_commit_graph_one(struct repository *repo, if (!open_ok) return NULL; - g = load_commit_graph_one_fd_st(repo, dir, fd, &st); - if (g) + g = commit_graph_read(repo, fd, &st); + if (g) { + g->dir = absolute_pathdup(dir); g->filename = absolute_pathdup(graph_file); + } return g; } diff --git a/commit-graph.h b/commit-graph.h index f0e7cc93461..8660c7fe698 100644 --- a/commit-graph.h +++ b/commit-graph.h @@ -117,14 +117,12 @@ struct commit_graph { }; /* - * Load commit graphs from the given object directory `dir`. The directory may - * be given as a relative path; it is canonicalized internally so that graphs - * loaded from the same directory compare equal regardless of how the caller - * spelled the path. + * Read a single commit graph layer from the given file descriptor. The file + * descriptor will be closed regardless of whether loading succeeds. Returns + * NULL on error. */ -struct commit_graph *load_commit_graph_one_fd_st(struct repository *repo, - const char *dir, - int fd, struct stat *st); +struct commit_graph *commit_graph_read(struct repository *repo, + int fd, struct stat *st); struct commit_graph *load_commit_graph_chain_fd_st(struct object_database *odb, int fd, struct stat *st, int *incomplete_chain);
-- 2.56.1.763.g16177fe143.dirty