From: Junio C Hamano Date: Thu, 20 Jan 2022 05:02:43 GMT Subject: Re: [PATCH v2 0/2] builtin add -p: fix hunk splitting Message-ID: In-Reply-To: <47e7b23a-56a3-b533-63ed-a854503b59ed@gmail.com> Phillip Wood 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'. >> - if ((marker == '-' || marker == '+') && *p == ' ') >> - hunk->splittable_into++; >> + if (*p == ' ') >> + complete_file(marker, &hunk->splittable_into);