diff mbox series

[73/76] diff.c: allow --no-color-moved-ws

Message ID	20190117130615.18732-74-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 73/76] diff.c: allow --no-color-moved-ws Date: Thu, 17 Jan 2019 20:06:12 +0700 Message-Id: <20190117130615.18732-74-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()

Commit Message

Duy Nguyen Jan. 17, 2019, 1:06 p.m. UTC

This option is added in commit b73bcbac4a (diff: allow
--no-color-moved-ws - 2018-11-23) in pw/diff-color-moved-ws-fix. To ease
merge conflict resolution, re-implement the option handling here so that
the conflict could be resolved by taking this side of change.

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

diff mbox series

Patch

diff --git a/diff.c b/diff.c
index e79a72cde9..daccc8226f 100644
--- a/diff.c
+++ b/diff.c
@@ -4932,7 +4932,11 @@  static int diff_opt_color_moved_ws(const struct option *opt,
 	struct diff_options *options = opt->value;
 	unsigned cm;
 
-	BUG_ON_OPT_NEG(unset);
+	if (unset) {
+		options->color_moved_ws_handling = 0;
+		return 0;
+	}
+
 	cm = parse_color_moved_ws(arg);
 	if (cm & COLOR_MOVED_WS_ERROR)
 		return error(_("invalid mode '%s' in --color-moved-ws"), arg);
@@ -5443,7 +5447,7 @@  static void prep_parse_options(struct diff_options *options)
 			       PARSE_OPT_OPTARG, diff_opt_color_moved),
 		OPT_CALLBACK_F(0, "color-moved-ws", options, N_("<mode>"),
 			       N_("how white spaces are ignored in --color-moved"),
-			       PARSE_OPT_NONEG, diff_opt_color_moved_ws),
+			       0, diff_opt_color_moved_ws),
 
 		OPT_GROUP(N_("Diff other options")),
 		OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"),