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

2018-09-10 Thread Junio C Hamano
Jeff King writes: >> 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 me

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

2018-09-10 Thread Jeff King
On Mon, Sep 10, 2018 at 09:53:56AM -0700, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason 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 do

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

2018-09-10 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason 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

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

2018-09-07 Thread Ævar Arnfjörð Bjarmason
On Sat, Sep 01 2018, Jeff King wrote: > On Fri, Aug 31, 2018 at 06:55:58PM -0400, Jeff King wrote: > >> On Fri, Aug 31, 2018 at 05:23:17PM +0200, Ævar Arnfjörð Bjarmason wrote: >> >> > On Tue, Aug 21 2018, Jeff King wrote: >> > >> > > +int bitmap_has_sha1_in_uninteresting(struct bitmap_index *bi

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

2018-09-04 Thread Jeff King
On Tue, Sep 04, 2018 at 12:30:14PM -0700, Stefan Beller wrote: > > [1/4]: bitmap_has_sha1_in_uninteresting(): drop BUG check > > > > The actual fix. This should get merged to next ASAP (or the original > > topic just reverted). > > > > [2/4]: t5310: test delta reuse with bitmaps > > >

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

2018-09-04 Thread Stefan Beller
> [1/4]: bitmap_has_sha1_in_uninteresting(): drop BUG check > > The actual fix. This should get merged to next ASAP (or the original > topic just reverted). > > [2/4]: t5310: test delta reuse with bitmaps > > I did this separately to give us flexibility to squash or merge > quic

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

2018-09-01 Thread Jeff King
On Fri, Aug 31, 2018 at 06:55:58PM -0400, Jeff King wrote: > On Fri, Aug 31, 2018 at 05:23:17PM +0200, Ævar Arnfjörð Bjarmason wrote: > > > On Tue, Aug 21 2018, Jeff King wrote: > > > > > +int bitmap_has_sha1_in_uninteresting(struct bitmap_index *bitmap_git, > > > +