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

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. For
example, could the interface to check_one_conflict() be improved? As
you said, part of the changes from your patch are now undone, so I
guess all three patches could even be squashed.


/Martin