Re: [PATCH 1/7] pack-objects: add --full-name-hash option
- From
Taylor Blau <me@ttaylorr.com>
- Date
- Nov 21, 2024, 21:35 UTC
- Message-ID
- <Zz+nk4w+y63vCupK@nand.local>
- In-Reply-To
- <Zz+TKS2O/ij6GZ1f@nand.local>
On Thu, Nov 21, 2024 at 03:08:09PM -0500, Taylor Blau wrote:
> The remaining parts of this change look good to me.
Oops, one thing I forgot (which reading Peff's message in [1] reminded me of) is that I think we need to disable full-name hashing when we're reusing existing packfiles as is the case with try_partial_reuse().
There we're always looking at classic name hash values, so mixing the two would be a mistake. I think that amounts to:
--- 8< ---
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 762949e4c8..7e370bcfc9 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -4070,6 +4070,8 @@ static int get_object_list_from_bitmap(struct rev_info *revs) if (!(bitmap_git = prepare_bitmap_walk(revs, 0))) return -1; + use_full_name_hash = 0; + if (pack_options_allow_reuse()) reuse_partial_packfile_from_bitmap(bitmap_git, &reuse_packfiles, --- >8 --- Thanks, Taylor [1]: https://lore.kernel.org/git/20241104172533.GA2985568@coredump.intra.peff.net/