[33/76] diff.c: convert --no-renames|--[no--rename-empty

Message ID	20190117130615.18732-34-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: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= <pclouds@gmail.com> Subject: [PATCH 33/76] diff.c: convert --no-renames\|--[no--rename-empty Date: Thu, 17 Jan 2019 20:05:32 +0700 Message-Id: <20190117130615.18732-34-pclouds@gmail.com> In-Reply-To: <20190117130615.18732-1-pclouds@gmail.com> References: <20190117130615.18732-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	Convert diff opt parser to parse_options() \| expand [00/76] Convert diff opt parser to parse_options() [01/76] parse-options.h: remove extern on function prototypes [02/76] parse-options: add one-shot mode [03/76] parse-options: allow keep-unknown + stop-at-non-opt combination [04/76] parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN [05/76] parse-options: add OPT_BITOP() [06/76] parse-options: stop abusing 'callback' for lowlevel callbacks [07/76] parse-options: avoid magic return codes [08/76] parse-options: allow ll_callback with OPTION_CALLBACK [09/76] diff.h: keep forward struct declarations sorted [10/76] diff.h: avoid bit fields in struct diff_flags [11/76] diff.c: prepare to use parse_options() for parsing [12/76] diff.c: convert -u\|-p\|--patch [13/76] diff.c: convert -U\|--unified [14/76] diff.c: convert -W\|--[no-]function-context [15/76] diff.c: convert --raw [16/76] diff.c: convert --patch-with-raw [17/76] diff.c: convert --numstat and --shortstat [18/76] diff.c: convert --dirstat and friends [19/76] diff.c: convert --check [20/76] diff.c: convert --summary [21/76] diff.c: convert --patch-with-stat [22/76] diff.c: convert --name-only [23/76] diff.c: convert --name-status [24/76] diff.c: convert -s\|--no-patch [25/76] diff.c: convert --stat* [26/76] diff.c: convert --[no-]compact-summary [27/76] diff.c: convert --output-* [28/76] diff.c: convert -B\|--break-rewrites [29/76] diff.c: convert -M\|--find-renames [30/76] diff.c: convert -D\|--irreversible-delete [31/76] diff.c: convert -C\|--find-copies [32/76] diff.c: convert --find-copies-harder [33/76] diff.c: convert --no-renames\|--[no--rename-empty [34/76] diff.c: convert --relative [35/76] diff.c: convert --[no-]minimal [36/76] diff.c: convert --ignore-some-changes [37/76] diff.c: convert --[no-]indent-heuristic [38/76] diff.c: convert --patience [39/76] diff.c: convert --histogram [40/76] diff.c: convert --diff-algorithm [41/76] diff.c: convert --anchored [42/76] diff.c: convert --binary [43/76] diff.c: convert --full-index [44/76] diff.c: convert -a\|--text [45/76] diff.c: convert -R [46/76] diff.c: convert --[no-]follow [47/76] diff.c: convert --[no-]color [48/76] diff.c: convert --word-diff [49/76] diff.c: convert --word-diff-regex [50/76] diff.c: convert --color-words [51/76] diff.c: convert --exit-code [52/76] diff.c: convert --quiet [53/76] diff.c: convert --ext-diff [54/76] diff.c: convert --textconv [55/76] diff.c: convert --ignore-submodules [56/76] diff.c: convert --submodule [57/76] diff.c: convert --ws-error-highlight [58/76] diff.c: convert --ita-[in]visible-in-index [59/76] diff.c: convert -z [60/76] diff.c: convert -l [61/76] diff.c: convert -S\|-G [62/76] diff.c: convert --pickaxe-all\|--pickaxe-regex [63/76] diff.c: convert -O [64/76] diff.c: convert --find-object [65/76] diff.c: convert --diff-filter [66/76] diff.c: convert --[no-]abbrev [67/76] diff.c: convert --[src\|dst]-prefix [68/76] diff.c: convert --line-prefix [69/76] diff.c: convert --no-prefix [70/76] diff.c: convert --inter-hunk-context [71/76] diff.c: convert --color-moved [72/76] diff.c: convert --color-moved-ws [73/76] diff.c: allow --no-color-moved-ws [74/76] range-diff: use parse_options() instead of diff_opt_parse() [75/76] diff --no-index: use parse_options() instead of diff_opt_parse() [76/76] am: avoid diff_opt_parse()

Message ID

20190117130615.18732-34-pclouds@gmail.com (mailing list archive)

State

New, archived

Headers

From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?=  <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?=  <pclouds@gmail.com>
Subject: [PATCH 33/76] diff.c: convert --no-renames|--[no--rename-empty
Date: Thu, 17 Jan 2019 20:05:32 +0700
Message-Id: <20190117130615.18732-34-pclouds@gmail.com>
In-Reply-To: <20190117130615.18732-1-pclouds@gmail.com>
References: <20190117130615.18732-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

Convert diff opt parser to parse_options() | expand

Commit Message

Duy Nguyen Jan. 17, 2019, 1:05 p.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 0756612eb0..fa666ced61 100644
--- a/diff.c
+++ b/diff.c
@@ -5091,6 +5091,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>"),
@@ -5125,13 +5130,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;

[33/76] diff.c: convert --no-renames|--[no--rename-empty

Commit Message

Patch