Re: [PATCH v2 0/2] builtin add -p: fix hunk splitting

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Jan 20, 2022, 08:42 UTC
Message-ID: <220120.86czkmn6gj.gmgdl@evledraar.gmail.com>
In-Reply-To: <xmqqr193j8y4.fsf@gitster.g>

On Wed, Jan 19 2022, Junio C Hamano wrote:

Show 10 quoted lines

> Phillip Wood <phillip.wood123@gmail.com> writes:
>
>> Even if the helper is finalizing the current hunk then I think that
>> "nonsense" hunk would still wrong as it would be calling
>> finalize_hunk() on _every_ context line in the hunk rather than just
>> being called once to finalize the hunk.
>
> True; this triggers every time we finish reading the common context
> lines and not at the end of hunk.  In any case, I think what we
> queued looks good for 'next'.

For what it's worth (and as the person who started this side-thread) I agree. This looks good as-is, thanks both!

>>>   -		if ((marker == '-' || marker == '+') && *p == ' ')
>>> -			hunk->splittable_into++;
>>> +		if (*p == ' ')
>>> +			complete_file(marker, &hunk->splittable_into);