diff.c: allow --no-color-moved-ws
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Mar 24, 2019 at 15:20 UTC
bb9872904e032f28e4ac9d2438c4daba9eae9d05
1 file changed
+6
-2
diff.c
+6
-2
@@ -4868,7 +4868,11 @@ static int diff_opt_color_moved_ws(const struct option *opt,
4868
struct diff_options *options = opt->value;
4869
unsigned cm;
4870
4871
- BUG_ON_OPT_NEG(unset);
4871
+ if (unset) {
4872
+ options->color_moved_ws_handling = 0;
4873
+ return 0;
4874
+ }
4875
+
4876
cm = parse_color_moved_ws(arg);
4877
if (cm & COLOR_MOVED_WS_ERROR)
4878
return error(_("invalid mode '%s' in --color-moved-ws"), arg);
@@ -5379,7 +5383,7 @@ static void prep_parse_options(struct diff_options *options)
5383
PARSE_OPT_OPTARG, diff_opt_color_moved),
5384
OPT_CALLBACK_F(0, "color-moved-ws", options, N_("<mode>"),
5385
N_("how white spaces are ignored in --color-moved"),
5382
- PARSE_OPT_NONEG, diff_opt_color_moved_ws),
5386
+ 0, diff_opt_color_moved_ws),
5387
5388
OPT_GROUP(N_("Diff other options")),
5389
OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"),