From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: pclouds@gmail.com
Cc: git@vger.kernel.org, gitster@pobox.com,
"SZEDER Gábor" <szeder.dev@gmail.com>
Subject: [PATCH v3 20/21] diff-parseopt: convert --[no-]minimal
Date: Sat, 16 Feb 2019 18:36:54 +0700 [thread overview]
Message-ID: <20190216113655.25728-21-pclouds@gmail.com> (raw)
In-Reply-To: <20190216113655.25728-1-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
diff.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/diff.c b/diff.c
index b9c267a199..33492e754f 100644
--- a/diff.c
+++ b/diff.c
@@ -5105,6 +5105,11 @@ static void prep_parse_options(struct diff_options *options)
OPT_BOOL(0, "rename-empty", &options->flags.rename_empty,
N_("use empty blobs as rename source")),
+ OPT_GROUP(N_("Diff algorithm options")),
+ OPT_BIT(0, "minimal", &options->xdl_opts,
+ N_("produce the smallest possible diff"),
+ XDF_NEED_MINIMAL),
+
OPT_GROUP(N_("Diff other options")),
OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"),
N_("when run from subdir, exclude changes outside and show relative paths"),
@@ -5142,11 +5147,7 @@ int diff_opt_parse(struct diff_options *options,
return ac;
/* xdiff options */
- if (!strcmp(arg, "--minimal"))
- DIFF_XDL_SET(options, NEED_MINIMAL);
- else if (!strcmp(arg, "--no-minimal"))
- DIFF_XDL_CLR(options, NEED_MINIMAL);
- else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
+ if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
DIFF_XDL_SET(options, IGNORE_WHITESPACE);
else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE);
--
2.21.0.rc0.328.g0e39304f8d
next prev parent reply other threads:[~2019-02-16 11:38 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-07 10:33 [PATCH 00/21] nd/diff-parseopt part 2 Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 01/21] diff.c: convert --patch-with-raw Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 02/21] diff.c: convert --numstat and --shortstat Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 03/21] diff.c: convert --dirstat and friends Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 04/21] diff.c: convert --check Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 05/21] diff.c: convert --summary Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 06/21] diff.c: convert --patch-with-stat Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 07/21] diff.c: convert --name-only Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 08/21] diff.c: convert --name-status Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 09/21] diff.c: convert -s|--no-patch Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 10/21] diff.c: convert --stat* Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 11/21] diff.c: convert --[no-]compact-summary Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 12/21] diff.c: convert --output-* Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 13/21] diff.c: convert -B|--break-rewrites Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 14/21] diff.c: convert -M|--find-renames Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 15/21] diff.c: convert -D|--irreversible-delete Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 16/21] diff.c: convert -C|--find-copies Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 17/21] diff.c: convert --find-copies-harder Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 18/21] diff.c: convert --no-renames|--[no--rename-empty Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 19/21] diff.c: convert --relative Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 20/21] diff.c: convert --[no-]minimal Nguyễn Thái Ngọc Duy
2019-02-07 10:33 ` [PATCH 21/21] diff.c: convert --ignore-some-changes Nguyễn Thái Ngọc Duy
2019-02-07 18:43 ` [PATCH 00/21] nd/diff-parseopt part 2 SZEDER Gábor
2019-02-11 17:12 ` Junio C Hamano
2019-02-11 18:35 ` Junio C Hamano
2019-02-16 11:33 ` [PATCH v2 " Nguyễn Thái Ngọc Duy
2019-02-16 11:33 ` [PATCH v2 01/21] diff-parseopt: convert --patch-with-raw Nguyễn Thái Ngọc Duy
2019-02-16 11:33 ` [PATCH v2 02/21] diff-parseopt: convert --numstat and --shortstat Nguyễn Thái Ngọc Duy
2019-02-16 11:33 ` [PATCH v2 03/21] diff-parseopt: convert --dirstat and friends Nguyễn Thái Ngọc Duy
2019-02-16 11:33 ` [PATCH v2 04/21] diff-parseopt: convert --check Nguyễn Thái Ngọc Duy
2019-02-16 11:33 ` [PATCH v2 05/21] diff-parseopt: convert --summary Nguyễn Thái Ngọc Duy
2019-02-16 11:33 ` [PATCH v2 06/21] diff-parseopt: convert --patch-with-stat Nguyễn Thái Ngọc Duy
2019-02-20 21:56 ` [PATCH v2 00/21] nd/diff-parseopt part 2 Junio C Hamano
2019-02-16 11:36 ` [PATCH v3 " Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` [PATCH v3 01/21] diff-parseopt: convert --patch-with-raw Nguyễn Thái Ngọc Duy
2019-02-20 20:41 ` Junio C Hamano
2019-02-16 11:36 ` [PATCH v3 02/21] diff-parseopt: convert --numstat and --shortstat Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` [PATCH v3 03/21] diff-parseopt: convert --dirstat and friends Nguyễn Thái Ngọc Duy
2019-02-17 13:39 ` Andrei Rybak
2019-02-16 11:36 ` [PATCH v3 04/21] diff-parseopt: convert --check Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` [PATCH v3 05/21] diff-parseopt: convert --summary Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` [PATCH v3 06/21] diff-parseopt: convert --patch-with-stat Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` [PATCH v3 07/21] diff-parseopt: convert --name-only Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` [PATCH v3 08/21] diff-parseopt: convert --name-status Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` [PATCH v3 09/21] diff-parseopt: convert -s|--no-patch Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` [PATCH v3 10/21] diff-parseopt: convert --stat* Nguyễn Thái Ngọc Duy
2019-02-20 21:08 ` Junio C Hamano
2019-02-16 11:36 ` [PATCH v3 11/21] diff-parseopt: convert --[no-]compact-summary Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` [PATCH v3 12/21] diff-parseopt: convert --output-* Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` [PATCH v3 13/21] diff-parseopt: convert -B|--break-rewrites Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` [PATCH v3 14/21] diff-parseopt: convert -M|--find-renames Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` [PATCH v3 15/21] diff-parseopt: convert -D|--irreversible-delete Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` [PATCH v3 16/21] diff-parseopt: convert -C|--find-copies Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` [PATCH v3 17/21] diff-parseopt: convert --find-copies-harder Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` [PATCH v3 18/21] diff-parseopt: convert --no-renames|--[no--rename-empty Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` [PATCH v3 19/21] diff-parseopt: convert --relative Nguyễn Thái Ngọc Duy
2019-02-16 11:36 ` Nguyễn Thái Ngọc Duy [this message]
2019-02-16 11:36 ` [PATCH v3 21/21] diff-parseopt: convert --ignore-some-changes Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 00/21] nd/diff-parseopt-2 updates Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 01/21] diff-parseopt: convert --patch-with-raw Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 02/21] diff-parseopt: convert --numstat and --shortstat Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 03/21] diff-parseopt: convert --dirstat and friends Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 04/21] diff-parseopt: convert --check Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 05/21] diff-parseopt: convert --summary Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 06/21] diff-parseopt: convert --patch-with-stat Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 07/21] diff-parseopt: convert --name-only Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 08/21] diff-parseopt: convert --name-status Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 09/21] diff-parseopt: convert -s|--no-patch Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 10/21] diff-parseopt: convert --stat* Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 11/21] diff-parseopt: convert --[no-]compact-summary Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 12/21] diff-parseopt: convert --output-* Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 13/21] diff-parseopt: convert -B|--break-rewrites Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 14/21] diff-parseopt: convert -M|--find-renames Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 15/21] diff-parseopt: convert -D|--irreversible-delete Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 16/21] diff-parseopt: convert -C|--find-copies Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 17/21] diff-parseopt: convert --find-copies-harder Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 18/21] diff-parseopt: convert --no-renames|--[no--rename-empty Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 19/21] diff-parseopt: convert --relative Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 20/21] diff-parseopt: convert --[no-]minimal Nguyễn Thái Ngọc Duy
2019-02-21 11:16 ` [PATCH v4 21/21] diff-parseopt: convert --ignore-some-changes Nguyễn Thái Ngọc Duy
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=20190216113655.25728-21-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@gmail.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.