Re: [PATCH 6/6] pack-objects: reuse on-disk deltas for thin "have" objects

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 21, 2018, 19:43 UTC
Message-ID: <xmqqin438pze.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20180821190705.GF30764@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 11 quoted lines

> When we serve a fetch, we pass the "wants" and "haves" from
> ...
> This lets us limit the change primarily to the oe_delta()
> and oe_set_delta_ext() functions. And as a bonus, most of
> the rest of the code does not consider these dummy entries
> at all, saving both runtime CPU and code complexity.
>
> Signed-off-by: Jeff King <peff@peff.net>
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---

Sorry for commenting on something completely off-topic, but when applied with "git am -s", I get a resulting commit with 3 S-o-b (the above two, plus the one added by "-s"), with a blank line in between them. I can understand the first blank line (the one between your two S-o-b), as the first S-o-b does not even appear to be part of the trailer block, but cannot explain why I get an extra one before the one added by "-s". Puzzled...

Show 5 quoted lines

> @@ -79,6 +81,7 @@ static unsigned long pack_size_limit;
>  static int depth = 50;
>  static int delta_search_threads;
>  static int pack_to_stdout;
> +static int thin;

It appears that this line is the only change since the previous round. The remainder of the patch looks cleanly done and readable.

Thanks.