From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Justin Frankel <justin@cockos.com>,
git@vger.kernel.org, eyvind.bernhardsen@gmail.com,
Bert Wesarg <bert.wesarg@googlemail.com>,
Avery Pennarun <apenwarr@gmail.com>
Subject: Re: [RFC/PATCH jn/merge-renormalize] merge-recursive: expose merge options for builtin merge
Date: Tue, 24 Aug 2010 23:29:06 -0500 [thread overview]
Message-ID: <20100825042906.GI11619@burratino> (raw)
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.
next prev parent reply other threads:[~2010-08-25 4:31 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-23 20:59 [PATCH v2] git-merge: ignore space support Justin Frankel
2010-08-24 2:28 ` Jonathan Nieder
2010-08-24 3:39 ` [RFC/PATCH jn/merge-renormalize] merge-recursive: expose merge options for builtin merge Jonathan Nieder
2010-08-24 18:52 ` Junio C Hamano
2010-08-25 4:29 ` Jonathan Nieder [this message]
2010-08-24 4:30 ` [PATCH v2] git-merge: ignore space support Justin Frankel
2010-08-25 4:40 ` Jonathan Nieder
2010-08-25 7:22 ` Bert Wesarg
2010-08-25 15:51 ` Justin Frankel
2010-08-25 17:55 ` Junio C Hamano
2010-08-25 18:21 ` Justin Frankel
2010-08-24 19:01 ` Junio C Hamano
2010-08-24 20:01 ` Bert Wesarg
2010-08-25 3:57 ` Jonathan Nieder
2010-08-26 5:41 ` [PATCH v3 0/4] " Jonathan Nieder
2010-08-26 5:47 ` [PATCH 1/4] merge-recursive: expose merge options for builtin merge Jonathan Nieder
2010-08-26 5:49 ` [PATCH 2/4] ll-merge: replace flag argument with options struct Jonathan Nieder
2010-08-26 16:39 ` Junio C Hamano
2011-01-16 1:08 ` [PATCH v1.7.4-rc2] ll-merge: simplify opts == NULL case Jonathan Nieder
2010-08-26 5:50 ` [PATCH 3/4] merge-recursive --patience Jonathan Nieder
2010-08-26 5:51 ` [PATCH 4/4] merge-recursive: options to ignore whitespace changes Jonathan Nieder
2010-08-26 16:39 ` Junio C Hamano
2010-08-27 8:24 ` Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100825042906.GI11619@burratino \
--to=jrnieder@gmail.com \
--cc=apenwarr@gmail.com \
--cc=bert.wesarg@googlemail.com \
--cc=eyvind.bernhardsen@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=justin@cockos.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.