From: Jeff King <peff@peff.net>
To: Taylor Blau <me@ttaylorr.com>
Cc: git@vger.kernel.org, vdye@github.com, derrickstolee@github.com,
avarab@gmail.com
Subject: Re: [PATCH v2] builtin/repack.c: remove redundant pack-based bitmaps
Date: Tue, 18 Oct 2022 02:29:01 -0400 [thread overview]
Message-ID: <Y05HrVT9HxxDiXc2@coredump.intra.peff.net> (raw)
In-Reply-To: <1e0ef7ee7ff5feb323c77e594cd65433fb1d99f7.1666061096.git.me@ttaylorr.com>
On Mon, Oct 17, 2022 at 10:45:12PM -0400, Taylor Blau wrote:
> When we write a MIDX bitmap after repacking, it is possible that the
> repository would be left in a state with both pack- and multi-pack
> reachability bitmaps.
>
> This can occur, for instance, if a pack that was kept (either by having
> a .keep file, or during a geometric repack in which it is not rolled up)
> has a bitmap file, and the repack wrote a multi-pack index and bitmap.
>
> When loading a reachability bitmap for the repository, the multi-pack
> one is always preferred, so the pack-based one is redundant. Let's
> remove it unconditionally, even if '-d' isn't passed, since there is no
> practical reason to keep both around. The patch below does just that.
Thanks, this version looks great to me.
> 1: 393fd4c6db ! 1: 1e0ef7ee7f builtin/repack.c: remove redundant pack-based bitmaps
> @@ builtin/repack.c: static int write_midx_included_packs(struct string_list *inclu
> + strbuf_addstr(&path, ".bitmap");
> +
> + if (unlink(path.buf) && errno != ENOENT)
> -+ die_errno(_("could not remove stale bitmap: %s"),
> -+ path.buf);
> ++ warning_errno(_("could not remove stale bitmap: %s"),
> ++ path.buf);
As noted elsewhere in the thread, this could be unlink_or_warn(), but
doing it manually lets us produce a more specific message, which is
nice.
-Peff
prev parent reply other threads:[~2022-10-18 6:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-12 19:05 [PATCH] builtin/repack.c: remove redundant pack-based bitmaps Taylor Blau
2022-10-17 18:02 ` Jeff King
2022-10-17 18:50 ` Ævar Arnfjörð Bjarmason
2022-10-17 19:27 ` Jeff King
2022-10-17 21:04 ` Junio C Hamano
2022-10-17 21:40 ` Jeff King
2022-10-18 2:38 ` Taylor Blau
2022-10-18 2:43 ` Taylor Blau
2022-10-18 2:45 ` [PATCH v2] " Taylor Blau
2022-10-18 6:29 ` Jeff King [this message]
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=Y05HrVT9HxxDiXc2@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=avarab@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=vdye@github.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).