From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Han-Wen Nienhuys <hanwen@google.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 2/6] fixup! Add reftable library
Date: Mon, 04 May 2020 13:31:22 +0000 [thread overview]
Message-ID: <ff60fde10919b6b8c54ecb8f38b710fac37624e3.1588599086.git.gitgitgadget@gmail.com> (raw)
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
next prev parent reply other threads:[~2020-05-04 13:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-04 13:31 [PATCH 0/6] Minimal patch series to fix the CI runs of hn/reftable Johannes Schindelin via GitGitGadget
2020-05-04 13:31 ` [PATCH 1/6] fixup! Add reftable library Johannes Schindelin via GitGitGadget
2020-05-04 13:31 ` Johannes Schindelin via GitGitGadget [this message]
2020-05-04 13:31 ` [PATCH 3/6] " Johannes Schindelin via GitGitGadget
2020-05-04 13:31 ` [PATCH 4/6] " Johannes Schindelin via GitGitGadget
2020-05-04 13:31 ` [PATCH 5/6] " Johannes Schindelin via GitGitGadget
2020-05-04 13:31 ` [PATCH 6/6] vcxproj: adjust for the reftable changes Johannes Schindelin via GitGitGadget
2020-05-04 17:12 ` Junio C Hamano
2020-05-04 15:56 ` [PATCH 0/6] Minimal patch series to fix the CI runs of hn/reftable Junio C Hamano
2020-05-05 8:02 ` Johannes Schindelin
2020-05-04 17:04 ` Han-Wen Nienhuys
2020-05-05 8:00 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ff60fde10919b6b8c54ecb8f38b710fac37624e3.1588599086.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=hanwen@google.com \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).