From 9dc0bf0e006ef8cf6f49ffafe40295e9803018db Mon Sep 17 00:00:00 2001 From: Taylor Blau Date: Fri, 26 Jun 2026 15:02:30 -0400 Subject: [PATCH] repack-geometry: drop unused redundant-pack removal The previous commit stopped using pack_geometry_remove_redundant() when deleting packs after a geometric repack. The existing_packs machinery now handles the same removal after geometric packs are marked for deletion. Remove the unused geometry-specific helper and its declaration. Signed-off-by: Taylor Blau Signed-off-by: Junio C Hamano --- repack-geometry.c | 44 -------------------------------------------- repack.h | 5 ----- 2 files changed, 49 deletions(-) diff --git a/repack-geometry.c b/repack-geometry.c index 2064683dcf..c75fa50861 100644 --- a/repack-geometry.c +++ b/repack-geometry.c @@ -245,50 +245,6 @@ struct packed_git *pack_geometry_preferred_pack(struct pack_geometry *geometry) return NULL; } -static void remove_redundant_packs(struct packed_git **pack, - uint32_t pack_nr, - struct string_list *names, - struct existing_packs *existing, - const char *packdir, - bool wrote_incremental_midx) -{ - const struct git_hash_algo *algop = existing->repo->hash_algo; - struct strbuf buf = STRBUF_INIT; - uint32_t i; - - for (i = 0; i < pack_nr; i++) { - struct packed_git *p = pack[i]; - if (string_list_has_string(names, hash_to_hex_algop(p->hash, - algop))) - continue; - - strbuf_reset(&buf); - strbuf_addstr(&buf, pack_basename(p)); - strbuf_strip_suffix(&buf, ".pack"); - - if ((p->pack_keep) || - (string_list_has_string(&existing->kept_packs, buf.buf))) - continue; - - repack_remove_redundant_pack(existing->repo, packdir, buf.buf, - wrote_incremental_midx); - } - - strbuf_release(&buf); -} - -void pack_geometry_remove_redundant(struct pack_geometry *geometry, - struct string_list *names, - struct existing_packs *existing, - const char *packdir, - bool wrote_incremental_midx) -{ - remove_redundant_packs(geometry->pack, geometry->split, - names, existing, packdir, wrote_incremental_midx); - remove_redundant_packs(geometry->promisor_pack, geometry->promisor_split, - names, existing, packdir, wrote_incremental_midx); -} - void pack_geometry_release(struct pack_geometry *geometry) { if (!geometry) diff --git a/repack.h b/repack.h index 90c89630ef..4295829cea 100644 --- a/repack.h +++ b/repack.h @@ -134,11 +134,6 @@ void pack_geometry_init(struct pack_geometry *geometry, const struct pack_objects_args *args); void pack_geometry_split(struct pack_geometry *geometry); struct packed_git *pack_geometry_preferred_pack(struct pack_geometry *geometry); -void pack_geometry_remove_redundant(struct pack_geometry *geometry, - struct string_list *names, - struct existing_packs *existing, - const char *packdir, - bool wrote_incremental_midx); void pack_geometry_release(struct pack_geometry *geometry); struct tempfile;