From: Taylor Blau Date: Fri, 26 Jun 2026 19:02:17 GMT Subject: [RFC PATCH 02/10] repack: extract `locate_existing_pack()` helper Message-ID: <1493023dccfd3e231ddc6a155c7fb5295a9631ec.1782500507.git.me@ttaylorr.com> In-Reply-To: Factor out the lookup from `existing_packs_retain_cruft()` that converts a pack basename to a `string_list_item` into a reusable static helper function, `locate_existing_pack()`. A subsequent commit will introduce a new function which will need to perform this same lookup against a different `string_list`. Signed-off-by: Taylor Blau --- repack.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/repack.c b/repack.c index 571dabb665e..986c74ac7e8 100644 --- a/repack.c +++ b/repack.c @@ -226,21 +226,32 @@ static void existing_packs_mark_for_deletion_1(const struct git_hash_algo *algop } } +static struct string_list_item *locate_existing_pack(struct string_list *list, + struct packed_git *p) +{ + struct strbuf buf = STRBUF_INIT; + struct string_list_item *item; + + strbuf_addstr(&buf, pack_basename(p)); + strbuf_strip_suffix(&buf, ".pack"); + + item = string_list_lookup(list, buf.buf); + + strbuf_release(&buf); + + return item; +} + void existing_packs_retain_cruft(struct existing_packs *existing, struct packed_git *cruft) { - struct strbuf buf = STRBUF_INIT; struct string_list_item *item; - strbuf_addstr(&buf, pack_basename(cruft)); - strbuf_strip_suffix(&buf, ".pack"); - - item = string_list_lookup(&existing->cruft_packs, buf.buf); + item = locate_existing_pack(&existing->cruft_packs, cruft); if (!item) BUG("could not find cruft pack '%s'", pack_basename(cruft)); existing_packs_mark_retained(item); - strbuf_release(&buf); } void existing_packs_mark_for_deletion(struct existing_packs *existing, -- 2.55.0.rc2.10.g29e31820dce