[01/21] diff.c: convert --patch-with-raw

Message ID	20190207103326.10693-2-pclouds@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= <pclouds@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= <pclouds@gmail.com> Subject: [PATCH 01/21] diff.c: convert --patch-with-raw Date: Thu, 7 Feb 2019 17:33:06 +0700 Message-Id: <20190207103326.10693-2-pclouds@gmail.com> In-Reply-To: <20190207103326.10693-1-pclouds@gmail.com> References: <20190207103326.10693-1-pclouds@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk
Series	nd/diff-parseopt part 2 \| expand [00/21] nd/diff-parseopt part 2 [01/21] diff.c: convert --patch-with-raw [02/21] diff.c: convert --numstat and --shortstat [03/21] diff.c: convert --dirstat and friends [04/21] diff.c: convert --check [05/21] diff.c: convert --summary [06/21] diff.c: convert --patch-with-stat [07/21] diff.c: convert --name-only [08/21] diff.c: convert --name-status [09/21] diff.c: convert -s\|--no-patch [10/21] diff.c: convert --stat* [11/21] diff.c: convert --[no-]compact-summary [12/21] diff.c: convert --output-* [13/21] diff.c: convert -B\|--break-rewrites [14/21] diff.c: convert -M\|--find-renames [15/21] diff.c: convert -D\|--irreversible-delete [16/21] diff.c: convert -C\|--find-copies [17/21] diff.c: convert --find-copies-harder [18/21] diff.c: convert --no-renames\|--[no--rename-empty [19/21] diff.c: convert --relative [20/21] diff.c: convert --[no-]minimal [21/21] diff.c: convert --ignore-some-changes

Message ID

20190207103326.10693-2-pclouds@gmail.com (mailing list archive)

State

New, archived

Headers

From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?=  <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?=
	=?utf-8?b?4buNYyBEdXk=?=  <pclouds@gmail.com>
Subject: [PATCH 01/21] diff.c: convert --patch-with-raw
Date: Thu,  7 Feb 2019 17:33:06 +0700
Message-Id: <20190207103326.10693-2-pclouds@gmail.com>
In-Reply-To: <20190207103326.10693-1-pclouds@gmail.com>
References: <20190207103326.10693-1-pclouds@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

nd/diff-parseopt part 2 | expand

Commit Message

Duy Nguyen Feb. 7, 2019, 10:33 a.m. UTC

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 diff.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/diff.c b/diff.c
index 4bc9df7362..12e333c67f 100644
--- a/diff.c
+++ b/diff.c
@@ -4901,6 +4901,10 @@  static void prep_parse_options(struct diff_options *options)
 		OPT_BIT_F(0, "raw", &options->output_format,
 			  N_("generate the diff in raw format"),
 			  DIFF_FORMAT_RAW, PARSE_OPT_NONEG),
+		OPT_BITOP(0, "patch-with-raw", &options->output_format,
+			  N_("synonym for '-p --raw'"),
+			  DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW,
+			  DIFF_FORMAT_NO_OUTPUT),
 		OPT_END()
 	};
 
@@ -4929,10 +4933,7 @@  int diff_opt_parse(struct diff_options *options,
 		return ac;
 
 	/* Output format options */
-	if (!strcmp(arg, "--patch-with-raw")) {
-		enable_patch_output(&options->output_format);
-		options->output_format |= DIFF_FORMAT_RAW;
-	} else if (!strcmp(arg, "--numstat"))
+	if (!strcmp(arg, "--numstat"))
 		options->output_format |= DIFF_FORMAT_NUMSTAT;
 	else if (!strcmp(arg, "--shortstat"))
 		options->output_format |= DIFF_FORMAT_SHORTSTAT;

[01/21] diff.c: convert --patch-with-raw

Commit Message

Patch