From: Kim Gybels <kgybels@infogroep.be>
To: git@vger.kernel.org
Cc: "Kim Gybels" <kgybels@infogroep.be>,
"Adam Borowski" <kilobyte@angband.pl>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Michael J Gruber" <git@grubix.eu>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Torsten Bögershausen" <tboegi@web.de>
Subject: [PATCH v2] gc --auto: clear repository before auto packing
Date: Wed, 4 Jul 2018 22:16:00 +0200 [thread overview]
Message-ID: <20180704201600.9908-1-kgybels@infogroep.be> (raw)
In-Reply-To: <20180630133822.4580-1-kgybels@infogroep.be>
Teach gc --auto to clear the repository before auto packing it to
prevent failures when removing files on Windows.
Also teach the test 'fetching with auto-gc does not lock up' to complain
when it is no longer triggering an auto packing of the repository.
Fixes https://github.com/git-for-windows/git/issues/500
Signed-off-by: Kim Gybels <kgybels@infogroep.be>
---
Updated after Duy Nguyen's comments:
- use repo_clear instead of close_all_packs, and add the call in
gc_before_repack intead of just before executing git repack
- use test_i18ngrep instead of grep in updated test
builtin/gc.c | 7 +++++++
t/t5510-fetch.sh | 4 +++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/builtin/gc.c b/builtin/gc.c
index ccfb1ceaeb..22a6fc4863 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -473,6 +473,13 @@ static int report_last_gc_error(void)
static int gc_before_repack(void)
{
+ /*
+ * Shut down everything, we should have all the info we need
+ * at this point. Leaving some file descriptors open may
+ * prevent them from being removed on Windows.
+ */
+ repo_clear(the_repository);
+
if (pack_refs && run_command_v_opt(pack_refs_cmd.argv, RUN_GIT_CMD))
return error(FAILED_RUN, pack_refs_cmd.argv[0]);
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index e402aee6a2..ef599c11cd 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -828,10 +828,12 @@ test_expect_success 'fetching with auto-gc does not lock up' '
test_commit test2 &&
(
cd auto-gc &&
+ git config fetch.unpackLimit 1 &&
git config gc.autoPackLimit 1 &&
git config gc.autoDetach false &&
GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
- ! grep "Should I try again" fetch.out
+ test_i18ngrep "Auto packing the repository" fetch.out &&
+ test_i18ngrep ! "Should I try again" fetch.out
)
'
--
2.18.0.windows.1
next prev parent reply other threads:[~2018-07-04 20:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-30 13:38 [PATCH] gc --auto: release pack files before auto packing Kim Gybels
2018-06-30 14:58 ` Duy Nguyen
2018-07-06 16:39 ` Junio C Hamano
2018-07-07 9:40 ` SZEDER Gábor
2018-07-07 23:16 ` Kim Gybels
2018-07-09 14:33 ` Duy Nguyen
2018-07-09 21:10 ` Junio C Hamano
2018-07-11 15:33 ` Duy Nguyen
2018-07-04 20:16 ` Kim Gybels [this message]
2018-07-07 9:57 ` [PATCH v2] gc --auto: clear repository " SZEDER Gábor
2018-07-09 20:37 ` [PATCH v3] gc --auto: release pack files " Kim Gybels
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180704201600.9908-1-kgybels@infogroep.be \
--to=kgybels@infogroep.be \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@grubix.eu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kilobyte@angband.pl \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=szeder.dev@gmail.com \
--cc=tboegi@web.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).