From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, peff@peff.net, jacob.e.keller@intel.com
Subject: [PATCH v2 5/7] diff: use skip-to-optional-val in parsing --relative
Date: Thu, 7 Dec 2017 09:30:32 -0800 [thread overview]
Message-ID: <20171207173034.12865-2-gitster@pobox.com> (raw)
In-Reply-To: <20171207173034.12865-1-gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
diff.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/diff.c b/diff.c
index cd032c6367..e99ac6ec8a 100644
--- a/diff.c
+++ b/diff.c
@@ -4563,11 +4563,10 @@ int diff_opt_parse(struct diff_options *options,
options->flags.rename_empty = 1;
else if (!strcmp(arg, "--no-rename-empty"))
options->flags.rename_empty = 0;
- else if (!strcmp(arg, "--relative"))
+ else if (skip_to_optional_val_default(arg, "--relative", &arg, NULL)) {
options->flags.relative_name = 1;
- else if (skip_prefix(arg, "--relative=", &arg)) {
- options->flags.relative_name = 1;
- options->prefix = arg;
+ if (arg)
+ options->prefix = arg;
}
/* xdiff options */
--
2.15.1-480-gbc5668f98a
next prev parent reply other threads:[~2017-12-07 17:30 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-07 0:35 [PATCH] diff: add test showing regression to --relative Jacob Keller
2017-12-07 1:04 ` Jeff King
2017-12-07 1:21 ` Jacob Keller
2017-12-07 17:30 ` [PATCH v2 0/7] reroll of cc/skip-to-optional-val Junio C Hamano
2017-12-07 17:30 ` Junio C Hamano [this message]
2017-12-07 19:03 ` [PATCH v2 5/7] diff: use skip-to-optional-val in parsing --relative Jacob Keller
2017-12-07 21:11 ` Jeff King
2017-12-07 21:59 ` Junio C Hamano
2017-12-07 22:21 ` Jeff King
2017-12-07 22:31 ` Junio C Hamano
2017-12-08 9:05 ` Jeff King
2017-12-08 21:09 ` Junio C Hamano
2017-12-07 17:30 ` [PATCH v2 6/7] t4045: reindent to make helpers readable Junio C Hamano
2017-12-07 17:30 ` [PATCH v2 7/7] t4045: test 'diff --relative' for real Junio C Hamano
2017-12-07 19:06 ` Jacob Keller
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=20171207173034.12865-2-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=jacob.e.keller@intel.com \
--cc=peff@peff.net \
/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).