From: Junio C Hamano <gitster@pobox.com>
To: Christian Couder <christian.couder@gmail.com>
Cc: git@vger.kernel.org, Donald R Laster Jr <laster@dlaster.com>,
Christian Couder <chriscool@tuxfamily.org>
Subject: Re: [PATCH v2 3/4] diff: use skip_to_optional_val()
Date: Mon, 04 Dec 2017 06:23:05 -0800 [thread overview]
Message-ID: <xmqqh8t6o9me.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20171204125617.4931-3-chriscool@tuxfamily.org> (Christian Couder's message of "Mon, 4 Dec 2017 13:56:16 +0100")
Christian Couder <christian.couder@gmail.com> writes:
> @@ -4540,13 +4535,13 @@ int diff_opt_parse(struct diff_options *options,
> return stat_opt(options, av);
>
> /* renames options */
> - else if (starts_with(arg, "-B") || starts_with(arg, "--break-rewrites=") ||
> - !strcmp(arg, "--break-rewrites")) {
> + else if (starts_with(arg, "-B") ||
> + skip_to_optional_val(arg, "--break-rewrites", &optarg)) {
> if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
> return error("invalid argument to -B: %s", arg+2);
> }
This is curious; "optarg" gets something, but it is not used (what
is passed to scoreopt_parse() is still "arg".
It merely is curious and not wrong; the actual parsing of the whole
thing is done in scoreopt_parse() and skip_to_optional_val() is used
merely as a substitute for "the thing must either be --break-rewrites
or must begin with --break-rewrites=" check that is done with
starts_with() and !strcmp().
It probably makes sense to allow skip_to_optional() to take a NULL
for the third parameter to clarify a callsite like this. Otherwise
the readers will wonder who consumes optarg, and why it is OK for it
to be sometimes set and sometimes left undefined.
> - else if (starts_with(arg, "-M") || starts_with(arg, "--find-renames=") ||
> - !strcmp(arg, "--find-renames")) {
> + else if (starts_with(arg, "-M") ||
> + skip_to_optional_val(arg, "--find-renames", &optarg)) {
Likewise.
> @@ -4554,8 +4549,8 @@ int diff_opt_parse(struct diff_options *options,
> else if (!strcmp(arg, "-D") || !strcmp(arg, "--irreversible-delete")) {
> options->irreversible_delete = 1;
> }
> - else if (starts_with(arg, "-C") || starts_with(arg, "--find-copies=") ||
> - !strcmp(arg, "--find-copies")) {
> + else if (starts_with(arg, "-C") ||
> + skip_to_optional_val(arg, "--find-copies", &optarg)) {
> if (options->detect_rename == DIFF_DETECT_COPY)
> options->flags.find_copies_harder = 1;
> if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
Likewise.
next prev parent reply other threads:[~2017-12-04 14:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-04 12:56 [PATCH v2 1/4] git-compat-util: introduce skip_to_optional_val() Christian Couder
2017-12-04 12:56 ` [PATCH v2 2/4] index-pack: use skip_to_optional_val() Christian Couder
2017-12-04 12:56 ` [PATCH v2 3/4] diff: " Christian Couder
2017-12-04 14:23 ` Junio C Hamano [this message]
2017-12-04 12:56 ` [PATCH v2 4/4] diff: use skip_to_optional_val_default() Christian Couder
2017-12-04 14:28 ` Junio C Hamano
2017-12-04 14:31 ` [PATCH v2 1/4] git-compat-util: introduce skip_to_optional_val() Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqh8t6o9me.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=laster@dlaster.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).