Re: [PATCH 0/4] un-breaking pack-objects with bitmaps

From: Jeff King <peff@peff.net>
Date: Sep 10, 2018, 18:48 UTC
Message-ID: <20180910184817.GB20678@sigill.intra.peff.net>
In-Reply-To: <xmqq1sa1uwd7.fsf@gitster-ct.c.googlers.com>

On Mon, Sep 10, 2018 at 09:53:56AM -0700, Junio C Hamano wrote:

Show 13 quoted lines

> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> 
> > I'm just reverting jk/pack-delta-reuse-with-bitmap out of next when
> > building my own package of git, but I think this really should be fixed
> > in that branch, either by merging the fix down or reverting the original
> > series out of next, I think just merging the fix down makes sense, but
> > have no strong opinion on it.
> 
> Either is fine.  I am not moving 'next' beyond what is necessary for
> this release cycle during the pre-release freeze period, and because
> I thought that Peff was in favor of squashing in the changes to the
> original when the next cycle starts, I haven't bothered to merge the
> fix there yet.

I think Ævar's point is just that the current tip of next is badly broken if you use bitmaps, and it's worth hot-fixing that in the meantime.

After the release, I'm OK with either one of squashing that first patch in, or just merging as-is.

-Peff