From: Taylor Blau <me@ttaylorr.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, derrickstolee@github.com, vdye@github.com,
gitster@pobox.com
Subject: Re: [PATCH] builtin/repack.c: remove redundant pack-based bitmaps
Date: Mon, 17 Oct 2022 22:43:17 -0400 [thread overview]
Message-ID: <Y04Sxb/ysk5tgyvZ@nand.local> (raw)
In-Reply-To: <Y02YzYS172skpbAb@coredump.intra.peff.net>
On Mon, Oct 17, 2022 at 02:02:53PM -0400, Jeff King wrote:
> > + if (unlink(path.buf) && errno != ENOENT)
> > + die_errno(_("could not remove stale bitmap: %s"),
> > + path.buf);
>
> We could downgrade this to a warning, since there is no downside to
> retaining those files (aside from wasted space). In
> remove_redundant_pack(), we call into unlink_pack_path(), which just
> ignores unlink errors (though arguably it should at least warn).
I think that downgrading this to `warning_errno()` is appropriate. I'll
make that change locally and send a new version.
I think a good separate topic is teaching `remove_redundant_pack()` to
emit warnings for non-ENOENT errors, too. But I'll leave that for
another day :-).
> > @@ -1059,10 +1088,15 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
> > refs_snapshot ? get_tempfile_path(refs_snapshot) : NULL,
> > show_progress, write_bitmaps > 0);
> >
> > + if (ret) {
> > + string_list_clear(&include, 0);
> > + return ret;
> > + }
> > +
> > + if (write_bitmaps)
> > + remove_redundant_bitmaps(&include, packdir);
> > +
> > string_list_clear(&include, 0);
> > -
> > - if (ret)
> > - return ret;
> > }
>
> You could avoid having to repeat the string-list cleanup here by
> structuring it like:
>
> if (!ret && write_bitmaps)
> remove_redundant_bitmaps(&include, packdir);
>
> /* as before, clear string list and possibly return ret */
>
> Since it's only one line, it's not that big a deal, but it simplifies
> the flow.
>
> It's correct either way, of course. One thing I did have to do while
> reviewing this was look at this hunk in place. The context omits that
> this is in the "if (write_midx)" conditional, which is of course very
> important. ;)
Great suggestion, thanks. I'll apply it locally and send a reroll now.
Thanks,
Taylor
next prev parent reply other threads:[~2022-10-18 2:45 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 [this message]
2022-10-18 2:45 ` [PATCH v2] " Taylor Blau
2022-10-18 6:29 ` Jeff King
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=Y04Sxb/ysk5tgyvZ@nand.local \
--to=me@ttaylorr.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--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.
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).