kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

commit-graph: don't peek into `struct lock_file` 

Similar to the previous commit, avoid peeking into the `struct
lock_file`. Use the lock file API instead.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Martin Ågren 2021-01-05 20:23:47 +01:00 committed by Junio C Hamano
parent d4a4976648
commit a52cdce936
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
commit-graph.c
View File

@ -1694,8 +1694,8 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
} else { } else {
hold_lock_file_for_update_mode(&lk, ctx->graph_name, hold_lock_file_for_update_mode(&lk, ctx->graph_name,
LOCK_DIE_ON_ERROR, 0444); LOCK_DIE_ON_ERROR, 0444);
fd = lk.tempfile->fd; fd = get_lock_file_fd(&lk);
f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf); f = hashfd(fd, get_lock_file_path(&lk));
} }


chunks[0].id = GRAPH_CHUNKID_OIDFANOUT; chunks[0].id = GRAPH_CHUNKID_OIDFANOUT;
@ -1833,7 +1833,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
result = rename(ctx->graph_name, final_graph_name); result = rename(ctx->graph_name, final_graph_name);


for (i = 0; i < ctx->num_commit_graphs_after; i++) for (i = 0; i < ctx->num_commit_graphs_after; i++)
fprintf(lk.tempfile->fp, "%s\n", ctx->commit_graph_hash_after[i]); fprintf(get_lock_file_fp(&lk), "%s\n", ctx->commit_graph_hash_after[i]);


if (result) { if (result) {
error(_("failed to rename temporary commit-graph file")); error(_("failed to rename temporary commit-graph file"));