[18/21] diff.c: convert --no-renames|--[no--rename-empty

Message ID	20190207103326.10693-19-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 18/21] diff.c: convert --no-renames\|--[no--rename-empty Date: Thu, 7 Feb 2019 17:33:23 +0700 Message-Id: <20190207103326.10693-19-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-19-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 18/21] diff.c: convert --no-renames|--[no--rename-empty
Date: Thu,  7 Feb 2019 17:33:23 +0700
Message-Id: <20190207103326.10693-19-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

For --rename-empty, see 90d43b0768 (teach diffcore-rename to
optionally ignore empty content - 2012-03-22) for more information.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 Documentation/diff-options.txt |  3 +++
 diff.c                         | 13 ++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index d3e8d634b2..4c0d40881b 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -392,6 +392,9 @@  endif::git-format-patch[]
 	Turn off rename detection, even when the configuration
 	file gives the default to do so.
 
+--[no-]rename-empty::
+	Whether to use empty blobs as rename source.
+
 ifndef::git-format-patch[]
 --check::
 	Warn if changes introduce conflict markers or whitespace errors.
diff --git a/diff.c b/diff.c
index abb1566f95..d423a06b41 100644
--- a/diff.c
+++ b/diff.c
@@ -5087,6 +5087,11 @@  static void prep_parse_options(struct diff_options *options)
 			       diff_opt_find_copies),
 		OPT_BOOL(0, "find-copies-harder", &options->flags.find_copies_harder,
 			 N_("use unmodified files as source to find copies")),
+		OPT_SET_INT_F(0, "no-renames", &options->detect_rename,
+			      N_("disable rename detection"),
+			      0, PARSE_OPT_NONEG),
+		OPT_BOOL(0, "rename-empty", &options->flags.rename_empty,
+			 N_("use empty blobs as rename source")),
 
 		OPT_GROUP(N_("Diff other options")),
 		{ OPTION_CALLBACK, 0, "output", options, N_("<file>"),
@@ -5121,13 +5126,7 @@  int diff_opt_parse(struct diff_options *options,
 		return ac;
 
 	/* renames options */
-	if (!strcmp(arg, "--no-renames"))
-		options->detect_rename = 0;
-	else if (!strcmp(arg, "--rename-empty"))
-		options->flags.rename_empty = 1;
-	else if (!strcmp(arg, "--no-rename-empty"))
-		options->flags.rename_empty = 0;
-	else if (skip_to_optional_arg_default(arg, "--relative", &arg, NULL)) {
+	if (skip_to_optional_arg_default(arg, "--relative", &arg, NULL)) {
 		options->flags.relative_name = 1;
 		if (arg)
 			options->prefix = arg;

[18/21] diff.c: convert --no-renames|--[no--rename-empty

Commit Message

Patch