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 <pclo...@gmail.com>
---
diff.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
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>"),
--
2.20.0.482.g66447595a7
