diff options
| author |  Derrick Stolee <dstolee@microsoft.com> | 2019-05-17 11:41:48 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-06-12 11:33:54 -0700 |
| commit | 5472c32c3724e1404c3d80368edc28910969c29a (patch) | |
| tree | d3b056a5e65caf540396dfecac1a2488457243c0 | |
| parent | commit-graph: use raw_object_store when closing (diff) | |
| download | tgif-5472c32c3724e1404c3d80368edc28910969c29a.tar.xz | |
packfile: close commit-graph in close_all_packs
The close_all_packs() method is used to close all read handles to
pack-files and the multi-pack-index before running 'git gc --auto'.
This is particularly important on the Windows platform, where read
handles block any writes to those files. Replacing one of these
files with a rename() will fail in this situation.
The commit-graph also performs a rename, so is susceptable to this
problem. We are careful to close the commit-graph before writing,
but that doesn't work when a 'git fetch' (or similar) process runs
'git gc --auto' which may write a commit-graph.
Here, close the commit-graph as part of close_all_packs().
Reported-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | packfile.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packfile.c b/packfile.c index 16bcb75262..ce12bffe3e 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, @@ -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); } /* |