From: Thomas Rast <trast@inf•ethz.ch>
To: John Keeping <john@keeping•me.uk>
Cc: <git@vger•kernel.org>, Michal Privoznik <mprivozn@redhat•com>
Subject: Re: [PATCH] diff: allow unstuck arguments with --diff-algorithm
Date: Fri, 5 Apr 2013 13:43:16 +0200 [thread overview]
Message-ID: <876201td7v.fsf@linux-k42r.v.cablecom.net> (raw)
In-Reply-To: <8fc6f21da7c876d50f2f35c73252e95d525dffb5.1365160527.git.john@keeping.me.uk> (John Keeping's message of "Fri, 5 Apr 2013 12:15:27 +0100")
John Keeping <john@keeping•me.uk> writes:
> The argument to --diff-algorithm is mandatory, so there is no reason to
> require the argument to be stuck to the option with '='. Change this
> for consistency with other Git commands.
>
> Note that this doesi not change the handling of diff-algorithm in
^
strayi ;-)
> merge-recursive.c since the primary interface to that is via the -X
> option to 'git merge' where the unstuck form does not make sense.
>
> Signed-off-by: John Keeping <john@keeping•me.uk>
> ---
> diff.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/diff.c b/diff.c
> index db952a5..e0152f8 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -3596,8 +3596,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
> options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
> else if (!strcmp(arg, "--histogram"))
> options->xdl_opts = DIFF_WITH_ALG(options, HISTOGRAM_DIFF);
> - else if (!prefixcmp(arg, "--diff-algorithm=")) {
> - long value = parse_algorithm_value(arg+17);
> + else if ((argcount = parse_long_opt("diff-algorithm", av, &optarg))) {
> + long value = parse_algorithm_value(optarg);
> if (value < 0)
> return error("option diff-algorithm accepts \"myers\", "
> "\"minimal\", \"patience\" and \"histogram\"");
> @@ -3605,6 +3605,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
> DIFF_XDL_CLR(options, NEED_MINIMAL);
> options->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
> options->xdl_opts |= value;
> + return argcount;
> }
>
> /* flags options */
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2013-04-06 16:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-05 11:15 [PATCH] diff: allow unstuck arguments with --diff-algorithm John Keeping
2013-04-05 11:43 ` Thomas Rast [this message]
2013-04-05 12:19 ` [PATCH v2] " John Keeping
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=876201td7v.fsf@linux-k42r.v.cablecom.net \
--to=trast@inf$(echo .)ethz.ch \
--cc=git@vger$(echo .)kernel.org \
--cc=john@keeping$(echo .)me.uk \
--cc=mprivozn@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox