[PATCH v2 9/8?] pack-objects: drop unused return value from add_object_entry()
- From
Jeff King <peff@peff.net>
- Date
- Jul 11, 2026, 07:58 UTC
- Message-ID
- <20260711075811.GC1457061@coredump.intra.peff.net>
- In-Reply-To
- <20260710-pks-odb-for-each-object-filter-v2-0-3710a9cc165a@pks.im>
On Fri, Jul 10, 2026 at 10:48:52AM +0200, Patrick Steinhardt wrote:
> The series is built on top of f85a7e6620 (Start Git 2.56 cycle, > 2026-07-06) with ps/odb-drop-whence at 8a7ad23e11 (odb: document object > info fields, 2026-07-02) merged into it.
Here's a patch doing the cleanup I proposed upthread.
-- >8 -- Subject: pack-objects: drop unused return value from add_object_entry()
This function returns 0/1 to its caller to tell them whether we actually added a new entry (or if we considered it redundant). But nobody has relied on that behavior since 5379a5c5ee (Thin pack generation: optimization., 2006-04-05).
The extra return does not hurt much, but it recently became a bit more confusing. We have a sister function, add_object_entry_from_bitmap(), which had the same return value semantics. That function recently changed to always return 0 (not void, because it must conform to a callback function interface). So now we have two related functions which both return an "int" but with different semantics.
Let's drop the unused "int" return from add_object_entry() entirely, which makes it more clear that the two functions have diverged.
Signed-off-by: Jeff King <peff@peff.net> --- I couldn't reference the commit by its id, since Junio has not yet picked up the v2 sent a few hours ago. ;)
builtin/pack-objects.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 8ff92c5272..3673b14b89 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1867,16 +1867,16 @@ static const char no_closure_warning[] = N_( "disabling bitmap writing, as some objects are not being packed" ); -static int add_object_entry(const struct object_id *oid, enum object_type type, - const char *name, int exclude) +static void add_object_entry(const struct object_id *oid, enum object_type type, + const char *name, int exclude) { struct packed_git *found_pack = NULL; off_t found_offset = 0; display_progress(progress_state, ++nr_seen); if (have_duplicate_entry(oid, exclude)) - return 0; + return; if (!want_object_in_pack(oid, exclude, &found_pack, &found_offset)) { /* The pack is missing an object, so it will not have closure */ @@ -1885,13 +1885,12 @@ static int add_object_entry(const struct object_id *oid, enum object_type type, warning(_(no_closure_warning)); write_bitmap_index = 0; } - return 0; + return; } create_object_entry(oid, type, pack_name_hash_fn(name), exclude, name && no_try_delta(name), found_pack, found_offset); - return 1; } static int add_object_entry_from_bitmap(const struct object_id *oid,
-- 2.55.0.580.gbbcb530e9e