From: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed, 25 Aug 2010 04:29:06 GMT
Subject: Re: [RFC/PATCH jn/merge-renormalize] merge-recursive: expose merge options for builtin merge
Message-ID: <20100825042906.GI11619@burratino>
In-Reply-To: <7vk4nfvo56.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:

>> There are two very similar blocks of code that recognize options for
>> the "recursive" merge strategy.  Unify them.
>>
>> No functional change intended.
>
> It makes sense, but I wonder why you chose to do "if (fun() <= 0) error"
> instead of usual "if (fun() < 0) error"...

No good reason (an attempt to vaguely imitate the interface of
handle_revision_opt() from revision.c).  Since both callers die for
an unrecognized option, returning 0 for success and -1 for failure
would indeed be simpler.

I'll try to find time to reroll the series (including --patience)
on top of jn/merge-renormalize tomorrow.  Probably
--ignore-space-change et al are safe, too, though some test cases
would be nice.