Re: [PATCH v2 1/2] mergetool: don't skip modify/remove conflicts

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 15, 2011, 20:12 UTC
Message-ID: <7vbp2dnjkt.fsf@alter.siamese.dyndns.org>
In-Reply-To: <alpine.DEB.2.00.1102142204240.7843@debian>

Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> writes:

Show 18 quoted lines

> On Mon, 14 Feb 2011, Junio C Hamano wrote:
>
>> But shouldn't you also revert the parts of my patch to do_plain_rerere()
>> and rerere_forget() that have similar special cases?
>
> Yep, done in patch 2/2.
>
> Your changes in find_conflicts() are still there after patch 1/2 and
> since do_plain_rerere() and rerere_forget() call find_conflicts(), I
> think they need to check for the punted paths. Only the callers of
> setup_rerere() no longer need to care.
>
> In patch 2/2, I refactored a bit more, so that find_conflicts()
> behaves the way it did before your first patch, and then the checks
> for punted paths are removed from the callers.
>
> If you think the second one is good, it could easily be squashed with
> the first one.  I left it separate because I wasn't quite sure.

Probably the changes to rerere proper from all three patches should be squashed into one, and then the patch to the script to use the new feature can be applied on top of it.