[PATCH 2/5] commit-graph: don't peek into `struct lock_file`
- From
- Martin Ågren <martin.agren@gmail.com>
- Date
- Jan 5, 2021, 19:23 UTC
- Message-ID
- <7a91469c7c791d5faeabc601775a3b535cbfc26e.1609874026.git.martin.agren@gmail.com>
- In-Reply-To
- <cover.1609874026.git.martin.agren@gmail.com>
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> --- commit-graph.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/commit-graph.c b/commit-graph.c index 06f8dc1d89..031641014f 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1694,8 +1694,8 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) } else { hold_lock_file_for_update_mode(&lk, ctx->graph_name, LOCK_DIE_ON_ERROR, 0444); - fd = lk.tempfile->fd; - f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf); + fd = get_lock_file_fd(&lk); + f = hashfd(fd, get_lock_file_path(&lk)); } 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); 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) { error(_("failed to rename temporary commit-graph file"));
-- 2.30.0