From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
rybak.a.v@gmail.com, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v4 09/21] diff-parseopt: convert -s|--no-patch
Date: Thu, 21 Feb 2019 18:16:09 +0700 [thread overview]
Message-ID: <20190221111621.27180-10-pclouds@gmail.com> (raw)
In-Reply-To: <20190221111621.27180-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 | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/diff.c b/diff.c
index 99047fb5fe..9c8f5336bc 100644
--- a/diff.c
+++ b/diff.c
@@ -4906,6 +4906,9 @@ static void prep_parse_options(struct diff_options *options)
OPT_BITOP('p', "patch", &options->output_format,
N_("generate patch"),
DIFF_FORMAT_PATCH, DIFF_FORMAT_NO_OUTPUT),
+ OPT_BIT_F('s', "no-patch", &options->output_format,
+ N_("suppress diff output"),
+ DIFF_FORMAT_NO_OUTPUT, PARSE_OPT_NONEG),
OPT_BITOP('u', NULL, &options->output_format,
N_("generate patch"),
DIFF_FORMAT_PATCH, DIFF_FORMAT_NO_OUTPUT),
@@ -4983,9 +4986,7 @@ int diff_opt_parse(struct diff_options *options,
return ac;
/* Output format options */
- if (!strcmp(arg, "-s") || !strcmp(arg, "--no-patch"))
- options->output_format |= DIFF_FORMAT_NO_OUTPUT;
- else if (starts_with(arg, "--stat"))
+ if (starts_with(arg, "--stat"))
/* --stat, --stat-width, --stat-name-width, or --stat-count */
return stat_opt(options, av);
else if (!strcmp(arg, "--compact-summary")) {
--
2.21.0.rc1.337.gdf7f8d0522
next prev parent reply other threads:[~2019-02-21 11:17 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 ` [PATCH v3 20/21] diff-parseopt: convert --[no-]minimal Nguyễn Thái Ngọc Duy
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 ` Nguyễn Thái Ngọc Duy [this message]
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
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=20190221111621.27180-10-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rybak.a.v@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.
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).