From: Patrick Steinhardt Date: Mon, 16 Nov 2026 13:07:41 GMT Subject: [PATCH 05/12] commit-graph: introduce common exit for `write_commit_graph_file()` Message-ID: <20261116-pks-odb-pluggable-commit-graphs-v1-5-a83fc1ff0808@pks.im> In-Reply-To: <20261116-pks-odb-pluggable-commit-graphs-v1-0-a83fc1ff0808@pks.im> In the next commit we're going to refactor `write_commit_graph_file()`. As part of that refactoring we'll perform a couple more allocations in this function that need to be cleaned up on exit. Prepare for this by introducing a common exit path now already, as that will make the diff a tiny bit easier to read. Signed-off-by: Patrick Steinhardt --- commit-graph.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/commit-graph.c b/commit-graph.c index 7f7146e752a..c146f20f68f 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -2099,6 +2099,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) struct strbuf progress_title = STRBUF_INIT; struct chunkfile *cf; unsigned char file_hash[GIT_MAX_RAWSZ]; + int ret; if (ctx->opts->flags & COMMIT_GRAPH_WRITE_SPLIT) { struct strbuf tmp_file = STRBUF_INIT; @@ -2112,9 +2113,9 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) } if (safe_create_leading_directories(ctx->r, ctx->graph_name)) { - error(_("unable to create leading directories of %s"), - ctx->graph_name); - return -1; + ret = error(_("unable to create leading directories of %s"), + ctx->graph_name); + goto out; } if (ctx->opts->flags & COMMIT_GRAPH_WRITE_SPLIT) { @@ -2126,14 +2127,14 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) graph_layer = mks_tempfile_m(ctx->graph_name, 0444); if (!graph_layer) { - error(_("unable to create temporary graph layer")); - return -1; + ret = error(_("unable to create temporary graph layer")); + goto out; } if (adjust_shared_perm(ctx->r, get_tempfile_path(graph_layer))) { - error(_("unable to adjust shared permissions for '%s'"), - get_tempfile_path(graph_layer)); - return -1; + ret = error(_("unable to adjust shared permissions for '%s'"), + get_tempfile_path(graph_layer)); + goto out; } f = hashfd(ctx->r->hash_algo, @@ -2227,8 +2228,8 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) int result; if (!chainf) { - error(_("unable to open commit-graph chain file")); - return -1; + ret = error(_("unable to open commit-graph chain file")); + goto out; } if (ctx->base_graph_name) { @@ -2243,8 +2244,8 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) result = rename(ctx->base_graph_name, dest); if (result) { - error(_("failed to rename base commit-graph file")); - return -1; + ret = error(_("failed to rename base commit-graph file")); + goto out; } } } else { @@ -2267,14 +2268,17 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) fprintf(get_lock_file_fp(&lk), "%s\n", ctx->commit_graph_hash_after[i]); if (result) { - error(_("failed to rename temporary commit-graph file")); - return -1; + ret = error(_("failed to rename temporary commit-graph file")); + goto out; } } commit_lock_file(&lk); + ret = 0; - return 0; +out: + rollback_lock_file(&lk); + return ret; } static void split_graph_merge_strategy(struct write_commit_graph_context *ctx, -- 2.56.1.763.g16177fe143.dirty