[PATCH 05/10] commit-graph: merge the two commit graph writers
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Nov 4, 2026, 15:57 UTC
- Message-ID
- <20261104-pks-commit-graph-write-refactorings-v1-5-d013d9401a59@pks.im>
- In-Reply-To
- <20261104-pks-commit-graph-write-refactorings-v1-0-d013d9401a59@pks.im>
We have two entry points for writing commit graphs:
- `write_commit_graph()` either writes a commit graph for all commits
in the object database, or for the commits specified via its options
struct. - `write_commit_graph_reachable()` writes a commit graph for all
reachable commits.It's somewhat pointless though to have a separate entry point for writing a commit graph for reachable commits, as this use case can be trivially satisfied via a flag.
Introduce that flag and drop the separate entry point in favor of `write_commit_graph()`. This ensures we have a single entry point for writing commit graphs, only, which will make it easier to eventually introduce pluggable commit graphs via the object database.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- builtin/commit-graph.c | 8 ++------ builtin/fetch.c | 7 +++++-- builtin/gc.c | 5 +++-- commit-graph.c | 47 ++++++++++++++++++++++------------------------- commit-graph.h | 4 +--- 5 files changed, 33 insertions(+), 38 deletions(-)
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index d49faf543b4..644f7736c91 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -299,17 +299,13 @@ static int cmd_commit_graph_write(int argc, if (opts.enable_changed_paths == 1 || git_env_bool(GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS, 0)) write_opts.flags |= COMMIT_GRAPH_WRITE_BLOOM_FILTERS; + if (opts.reachable) + write_opts.flags |= COMMIT_GRAPH_WRITE_REACHABLE; dir = odb_source_files_find_dir(repo->objects, opts.obj_dir); if (!dir) die(_("could not find object directory matching %s"), opts.obj_dir); - if (opts.reachable) { - if (write_commit_graph_reachable(repo, dir->abspath, &write_opts)) - result = 1; - goto cleanup; - } - if (opts.stdin_packs) { struct strbuf packname = STRBUF_INIT; size_t dirlen; diff --git a/builtin/fetch.c b/builtin/fetch.c index b76e7725728..637d7ddaa06 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -2941,6 +2941,8 @@ int cmd_fetch(int argc, write_opts.flags |= COMMIT_GRAPH_WRITE_SPLIT; if (progress) write_opts.flags |= COMMIT_GRAPH_WRITE_PROGRESS; + if (graph_write_mode != GRAPH_WRITE_TIPS) + write_opts.flags |= COMMIT_GRAPH_WRITE_REACHABLE; if (graph_write_mode != GRAPH_WRITE_SKIP) { trace2_region_enter("fetch", "write-commit-graph", @@ -2951,9 +2953,10 @@ int cmd_fetch(int argc, the_repository->objects->source->path, NULL, &updated_tips, &write_opts); else - write_commit_graph_reachable( + write_commit_graph( the_repository, - the_repository->objects->source->path, &write_opts); + the_repository->objects->source->path, + NULL, NULL, &write_opts); trace2_region_leave("fetch", "write-commit-graph", the_repository); } diff --git a/builtin/gc.c b/builtin/gc.c index a157909ed54..709789dbf2c 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -737,11 +737,12 @@ int cmd_gc(int argc, if (the_repository->settings.gc_write_commit_graph == 1) { struct commit_graph_write_options write_opts = COMMIT_GRAPH_WRITE_OPTIONS_INIT; + write_opts.flags |= COMMIT_GRAPH_WRITE_REACHABLE; if (!opts.quiet && !daemonized) write_opts.flags |= COMMIT_GRAPH_WRITE_PROGRESS; - write_commit_graph_reachable(the_repository, - the_repository->objects->source->path, &write_opts); + write_commit_graph(the_repository, the_repository->objects->source->path, + NULL, NULL, &write_opts); } if (!daemonized) { diff --git a/commit-graph.c b/commit-graph.c index 4f3563f4d0b..97be0f71484 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -37,10 +37,11 @@ void git_test_write_commit_graph_or_die(struct repository *repo) if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0)) return; + opts.flags |= COMMIT_GRAPH_WRITE_REACHABLE; if (git_env_bool(GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS, 0)) opts.flags |= COMMIT_GRAPH_WRITE_BLOOM_FILTERS; - if (write_commit_graph_reachable(repo, repo->objects->source->path, &opts)) + if (write_commit_graph(repo, repo->objects->source->path, NULL, NULL, &opts)) die("failed to write commit-graph under GIT_TEST_COMMIT_GRAPH"); } @@ -1910,32 +1911,23 @@ static int add_ref_to_set(const struct reference *ref, void *cb_data) return 0; } -int write_commit_graph_reachable(struct repository *repo, - const char *dir, - const struct commit_graph_write_options *opts) +static void fill_oids_from_reachable(struct write_commit_graph_context *ctx, + struct oidset *commits) { - struct oidset commits = OIDSET_INIT; - struct refs_cb_data data; - int result; - - memset(&data, 0, sizeof(data)); - data.repo = repo; - data.commits = &commits; + struct refs_cb_data data = { + .repo = ctx->r, + .commits = commits, + }; - if (opts->flags & COMMIT_GRAPH_WRITE_PROGRESS) + if (ctx->opts->flags & COMMIT_GRAPH_WRITE_PROGRESS) data.progress = start_delayed_progress( - repo, + ctx->r, _("Collecting referenced commits"), 0); - refs_for_each_ref(get_main_ref_store(repo), add_ref_to_set, + refs_for_each_ref(get_main_ref_store(ctx->r), add_ref_to_set, &data); stop_progress(&data.progress); - - result = write_commit_graph(repo, dir, NULL, &commits, opts); - - oidset_clear(&commits); - return result; } static int fill_oids_from_packs(struct write_commit_graph_context *ctx, @@ -2567,9 +2559,13 @@ int write_commit_graph(struct repository *r, int res = 0; int replace = 0; struct bloom_filter_settings bloom_settings = DEFAULT_BLOOM_FILTER_SETTINGS; + struct oidset reachable_commits = OIDSET_INIT; struct topo_level_slab topo_levels; struct commit_graph *g; + if (!!pack_indexes + !!commits + !!(opts->flags & COMMIT_GRAPH_WRITE_REACHABLE) > 1) + BUG("attempting to write commit-graph with mutually incompatible options"); + prepare_repo_settings(r); if (!r->settings.core_commit_graph) { warning(_("attempting to write a commit-graph, but 'core.commitGraph' is disabled")); @@ -2652,14 +2648,14 @@ int write_commit_graph(struct repository *r, ctx.order_by_pack = 1; if ((res = fill_oids_from_packs(&ctx, pack_indexes))) goto cleanup; - } - - if (commits) { + } else if (commits) { if ((res = fill_oids_from_commits(&ctx, commits))) goto cleanup; - } - - if (!pack_indexes && !commits) { + } else if (opts->flags & COMMIT_GRAPH_WRITE_REACHABLE) { + fill_oids_from_reachable(&ctx, &reachable_commits); + if ((res = fill_oids_from_commits(&ctx, &reachable_commits))) + goto cleanup; + } else { ctx.order_by_pack = 1; fill_oids_from_all_packs(&ctx); } @@ -2710,6 +2706,7 @@ int write_commit_graph(struct repository *r, free(ctx.base_graph_name); free(ctx.dir); commit_stack_clear(&ctx.commits); + oidset_clear(&reachable_commits); oid_array_clear(&ctx.oids); clear_topo_level_slab(&topo_levels); diff --git a/commit-graph.h b/commit-graph.h index 7461093a990..4adbd5f18d9 100644 --- a/commit-graph.h +++ b/commit-graph.h @@ -160,6 +160,7 @@ enum commit_graph_write_flags { COMMIT_GRAPH_WRITE_SPLIT = (1 << 2), COMMIT_GRAPH_WRITE_BLOOM_FILTERS = (1 << 3), COMMIT_GRAPH_NO_WRITE_BLOOM_FILTERS = (1 << 4), + COMMIT_GRAPH_WRITE_REACHABLE = (1 << 5), }; enum commit_graph_split_flags { @@ -192,9 +193,6 @@ struct commit_graph_write_options { * canonicalized internally so that it compares equal to the directory of * graphs that have already been loaded. */ -int write_commit_graph_reachable(struct repository *repo, - const char *dir, - const struct commit_graph_write_options *opts); int write_commit_graph(struct repository *r, const char *dir, const struct string_list *pack_indexes,
-- 2.56.0.500.g5d06dc02cd.dirty