[PATCH 2/6] fixup! Add reftable library

From: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Date: May 4, 2020, 13:31 UTC
Message-ID: <ff60fde10919b6b8c54ecb8f38b710fac37624e3.1588599086.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.623.git.1588599086.gitgitgadget@gmail.com>

From: Johannes Schindelin <johannes.schindelin@gmx.de>

Do close the file descriptors to obsolete files before trying to delete them. This is actually required on Windows.

Note: this patch is probably a bit heavy-handed, releasing more than
necessary (which will then have to be re-read). But it seems to be
enough to let t0031 pass on Windows, so it is at least a clue as to what
the fix will look like eventually.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 reftable/stack.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/reftable/stack.c b/reftable/stack.c
index 2e32f7671c2..3c5f4a43130 100644
--- a/reftable/stack.c
+++ b/reftable/stack.c
@@ -941,6 +941,10 @@ static int stack_compact_range(struct reftable_stack *st, int first, int last,
 	}
 	have_lock = false;
 
+	reftable_merged_table_close(st->merged);
+	merged_table_clear(st->merged);
+	reftable_merged_table_free(st->merged);
+	st->merged = NULL;
 	{
 		char **p = delete_on_success;
 		while (*p) {

-- 
gitgitgadget