Re: [PATCH 1/2] pack-objects: Teach --use-bitmap-index codepath to respect --local, --honor-pack-keep and --incremental
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 8, 2016, 16:11 UTC
- Message-ID
- <xmqqfuqfgrzq.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <20160808123734.GA3995@teco.navytux.spb.ru>
Kirill Smelkov <kirr@nexedi.com> writes:
Show 13 quoted lines
>> > ... >> > Suggested-by: Junio C Hamano <gitster@pobox.com> >> > Discussed-with: Jeff King <peff@peff.net> >> > --- >> >> I do not think I suggested much of this to deserve credit like this, >> though, as I certainly haven't thought about the pros-and-cons >> between adding the same "some object in pack may not want to be in >> the output" logic to the bitmap side, or punting the bitmap codepath >> when local/keep are involved. > > I understand. Still for me it was you who convinced me to add proper > support for e.g. --local vs bitmap instead of special-casing it.
OK, in such a case, it probably is more sensible to do it like:
...
with all differences strangely showing we are a bit faster now, but
probably all being within noise. Credit for inspiring this solution and discussing the design of
the change goes to Junio and Jeff King. Signed-off-by: Kirill Smelkov <kirr@nexedi.com>
---
builtin/pack-objects.c | 36 ++++++++++++-----
t/t5310-pack-bitmaps.sh | 103 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+), 9 deletions(-)Don't forget your own sign-off ;-)