Re: [PATCH] add -p: coalesce hunks before testing applicability

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 30, 2018, 14:51 UTC
Message-ID: <xmqqwos77vru.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <e5b2900a-0558-d3bf-8ea1-d526b078bbc2@talktalk.net>

Phillip Wood <phillip.wood@talktalk.net> writes:

Show 22 quoted lines

> When $newhunk is created it is marked as dirty to prevent
> coalesce_overlapping_hunks() from coalescing it. This patch does not
> change that. What is happening is that by calling
> coalesce_overlapping_hunks() the hunks that are not currently selected
> are filtered out and any hunks that can be coalesced are (I think that
> in the test that starts passing with this patch the only change is the
> filtering as there's only a single hunk selected).
>
> This is a subtle change to the test for the applicability of an edited
> hunk. Previously when all the hunks were used to create the test patch
> we could be certain that if the test patch applied then if the user
> later selected any unselected hunk or deselected any selected hunk
> then that operation would succeed. I'm not sure that is true now (but
> I haven't thought about it for very long). We could restore the old
> test condition and coalesce the hunks by copying all the hunks and
> setting $hunk->{USE}=1 when creating the test patch if that turns out
> to be useful (it would be interesting to see if the test still passes
> with that change).
>
> Best Wishes
>
> Phillip

OK, I marked the topic as "will merge to next" but unmark it for now, as we are not in a hurry to graduate new topics to 'master' anyway. Hopefully between Jochen and you, perhaps others, can explore the issues you raised and come to some conclusion before it becomes necessary (i.e. when the next cycle begins).

Thanks.