[PATCH 1/6] fixup! Add reftable library

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

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

Close files before trying to unlink them. This is actually required on Windows.

Note: this is probably not the only part of the code that requires this
type of fix, but it seems to be enough to let the _current_ version of
t0031 pass.

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 e7b625d924a..2e32f7671c2 100644
--- a/reftable/stack.c
+++ b/reftable/stack.c
@@ -852,6 +852,10 @@ static int stack_compact_range(struct reftable_stack *st, int first, int last,
 		}
 	}
 
+	if (lock_file_fd > 0) {
+		close(lock_file_fd);
+		lock_file_fd = 0;
+	}
 	err = unlink(slice_as_string(&lock_file_name));
 	if (err < 0) {
 		goto exit;

-- 
gitgitgadget