diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-10 01:25:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-10 01:25:37 +0300 |
| commit | 5cb7c73589059b557f0d690ed6bcfde46ef2d234 (patch) | |
| tree | 1aa18e271907b69b4d49494231f8acc6f950ff4d /commit-graph.c | |
| parent | e1168940ce11878261ece4602a7d8b8ee9a8c77e (diff) | |
| parent | 2d511cfc0bfe1d2b98ba8b272ddd9ba83e84e5f8 (diff) | |
Merge branch 'ds/close-object-store'
The commit-graph file is now part of the "files that the runtime
may keep open file descriptors on, all of which would need to be
closed when done with the object store", and the file descriptor to
an existing commit-graph file now is closed before "gc" finalizes a
new instance to replace it.
* ds/close-object-store:
packfile: rename close_all_packs to close_object_store
packfile: close commit-graph in close_all_packs
commit-graph: use raw_object_store when closing
Diffstat (limited to 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/commit-graph.c b/commit-graph.c index 89c4b982dd..1752341098 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -361,10 +361,10 @@ int generation_numbers_enabled(struct repository *r) return !!first_generation; } -void close_commit_graph(struct repository *r) +void close_commit_graph(struct raw_object_store *o) { - free_commit_graph(r->objects->commit_graph); - r->objects->commit_graph = NULL; + free_commit_graph(o->commit_graph); + o->commit_graph = NULL; } static int bsearch_graph(struct commit_graph *g, struct object_id *oid, uint32_t *pos) @@ -1093,7 +1093,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) stop_progress(&ctx->progress); strbuf_release(&progress_title); - close_commit_graph(ctx->r); + close_commit_graph(ctx->r->objects); finalize_hashfile(f, NULL, CSUM_HASH_IN_STREAM | CSUM_FSYNC); commit_lock_file(&lk); |