diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-10-28 18:26:54 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-10-28 18:26:54 (GMT) |
commit | c5dd7773e138d4b41074d4c6a193651cc187ec1d (patch) | |
tree | ab57c07089c9df58e6864161d5528148fb32c68b /builtin/repack.c | |
parent | 7b9b634ca5e931941938c93bd233d9c6848fd7b2 (diff) | |
parent | 55d902cd61a8fd2e9b9aa4bf49b47e4dbf10ea67 (diff) | |
download | git-c5dd7773e138d4b41074d4c6a193651cc187ec1d.zip git-c5dd7773e138d4b41074d4c6a193651cc187ec1d.tar.gz git-c5dd7773e138d4b41074d4c6a193651cc187ec1d.tar.bz2 |
Merge branch 'tb/remove-unused-pack-bitmap'
When creating a multi-pack bitmap, remove per-pack bitmap files
unconditionally as they will never be consulted.
* tb/remove-unused-pack-bitmap:
builtin/repack.c: remove redundant pack-based bitmaps
Diffstat (limited to 'builtin/repack.c')
-rw-r--r-- | builtin/repack.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/builtin/repack.c b/builtin/repack.c index f719096..3f0cd55 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -661,6 +661,35 @@ static int write_midx_included_packs(struct string_list *include, return finish_command(&cmd); } +static void remove_redundant_bitmaps(struct string_list *include, + const char *packdir) +{ + struct strbuf path = STRBUF_INIT; + struct string_list_item *item; + size_t packdir_len; + + strbuf_addstr(&path, packdir); + strbuf_addch(&path, '/'); + packdir_len = path.len; + + /* + * Remove any pack bitmaps corresponding to packs which are now + * included in the MIDX. + */ + for_each_string_list_item(item, include) { + strbuf_addstr(&path, item->string); + strbuf_strip_suffix(&path, ".idx"); + strbuf_addstr(&path, ".bitmap"); + + if (unlink(path.buf) && errno != ENOENT) + warning_errno(_("could not remove stale bitmap: %s"), + path.buf); + + strbuf_setlen(&path, packdir_len); + } + strbuf_release(&path); +} + static int write_cruft_pack(const struct pack_objects_args *args, const char *pack_prefix, struct string_list *names, @@ -1059,6 +1088,9 @@ 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 && write_bitmaps) + remove_redundant_bitmaps(&include, packdir); + string_list_clear(&include, 0); if (ret) |