diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2018-11-23 11:16:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-10 18:37:59 (GMT) |
| commit | b73bcbac4a9d8c76ccdda0f0ac4b122b8e96e4b7 (patch) | |
| tree | c2c20f8d06a6cafe921e38a5ea44ce9a73d18c93 /diff.c | |
| parent | 748aa1aa34a316b8f26a3664f3fdcd273e1c5c39 (diff) | |
| download | git-b73bcbac4a9d8c76ccdda0f0ac4b122b8e96e4b7.zip git-b73bcbac4a9d8c76ccdda0f0ac4b122b8e96e4b7.tar.gz git-b73bcbac4a9d8c76ccdda0f0ac4b122b8e96e4b7.tar.bz2 | |
diff: allow --no-color-moved-ws
Allow --no-color-moved-ws and --color-moved-ws=no to cancel any previous
--color-moved-ws option.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -304,7 +304,9 @@ static int parse_color_moved_ws(const char *arg) strbuf_addstr(&sb, i->string); strbuf_trim(&sb); - if (!strcmp(sb.buf, "ignore-space-change")) + if (!strcmp(sb.buf, "no")) + ret = 0; + else if (!strcmp(sb.buf, "ignore-space-change")) ret |= XDF_IGNORE_WHITESPACE_CHANGE; else if (!strcmp(sb.buf, "ignore-space-at-eol")) ret |= XDF_IGNORE_WHITESPACE_AT_EOL; @@ -5036,6 +5038,8 @@ int diff_opt_parse(struct diff_options *options, if (cm < 0) die("bad --color-moved argument: %s", arg); options->color_moved = cm; + } else if (!strcmp(arg, "--no-color-moved-ws")) { + options->color_moved_ws_handling = 0; } else if (skip_prefix(arg, "--color-moved-ws=", &arg)) { options->color_moved_ws_handling = parse_color_moved_ws(arg); } else if (skip_to_optional_arg_default(arg, "--color-words", &options->word_regex, NULL)) { |