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 /packfile.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 'packfile.c')
| -rw-r--r-- | packfile.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packfile.c b/packfile.c index d786ec7312..ed61187504 100644 --- a/packfile.c +++ b/packfile.c @@ -16,6 +16,7 @@ #include "tree.h" #include "object-store.h" #include "midx.h" +#include "commit-graph.h" char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, @@ -336,7 +337,7 @@ void close_pack(struct packed_git *p) close_pack_index(p); } -void close_all_packs(struct raw_object_store *o) +void close_object_store(struct raw_object_store *o) { struct packed_git *p; @@ -350,6 +351,8 @@ void close_all_packs(struct raw_object_store *o) close_midx(o->multi_pack_index); o->multi_pack_index = NULL; } + + close_commit_graph(o); } /* |