git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 05/12] commit-graph: introduce common exit for `write_commit_graph_file()`

From
Patrick Steinhardt <ps@pks.im>
Date
Nov 16, 2026, 13:07 UTC
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 <ps@pks.im>
---
 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
Previous: Patrick SteinhardtNext: Patrick Steinhardt
Message 7 of 14 in “Introduce pluggable commit graphs”
  1. 00/12 Introduce pluggable commit graphsPatrick Steinhardt, Nov 16, 2026
  2. 01/12 commit-graph: simplify linking commit graph chainsPatrick Steinhardt, Nov 16, 2026
  3. Junio C HamanoNov 16, 2026
  4. 02/12 commit-graph: simplify reading a single commit graphPatrick Steinhardt, Nov 16, 2026
  5. 03/12 commit-graph: expose function to validate a commit graph chainPatrick Steinhardt, Nov 16, 2026
  6. 04/12 commit-graph: decide mergeable and chainable layers by depthPatrick Steinhardt, Nov 16, 2026
  7. 05/12 commit-graph: introduce common exit for `write_commit_graph_file()`Patrick Steinhardt, Nov 16, 2026
  8. 06/12 commit-graph: derive layer infos from the passed-in chainPatrick Steinhardt, Nov 16, 2026
  9. 07/12 commit-graph: split out check whether writing commit graphs is allowedPatrick Steinhardt, Nov 16, 2026
  10. 08/12 commit-graph: split out logic to write a new commit graph layerPatrick Steinhardt, Nov 16, 2026
  11. 09/12 commit-graph: mark incomplete commit graph chainsPatrick Steinhardt, Nov 16, 2026
  12. 10/12 odb/source: make commit graphs pluggablePatrick Steinhardt, Nov 16, 2026
  13. 11/12 odb/source-files: move logic to derive commit graph pathsPatrick Steinhardt, Nov 16, 2026
  14. 12/12 odb/source-files: internalize logic to derive commit graph pathsPatrick Steinhardt, Nov 16, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.