[PATCH] diff.c: die on unknown color-moved ws mode
- From
Stefan Beller <sbeller@google.com>
- Date
- Oct 11, 2018, 22:59 UTC
- Message-ID
- <20181011225928.76051-1-sbeller@google.com>
- In-Reply-To
- <xmqqa7nkf6o4.fsf@gitster-ct.c.googlers.com>
Noticed-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Stefan Beller <sbeller@google.com> ---
There is no "ignore-any" supported by the feature---I think that the parser for the option should have noticed and barfed, but it did not. It merely emitted a message to the standard output and let it scroll away with the huge diff before the reader noticed it. Addressed in this patch.
Am I missing something [...] ?
Note that this parsing is used for both the parsing from command line as well as options, i.e.
git config diff.colorMovedWS asdf git format-patch HEAD^ fatal: ignoring unknown color-moved-ws mode 'asdf' git config --unset diff.colorMovedWS
(format-patch parses these color specific things, but doesn't apply it) diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/diff.c b/diff.c index 145cfbae59..bdf4535d69 100644 --- a/diff.c +++ b/diff.c @@ -313,7 +313,7 @@ static int parse_color_moved_ws(const char *arg) else if (!strcmp(sb.buf, "allow-indentation-change")) ret |= COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE; else - error(_("ignoring unknown color-moved-ws mode '%s'"), sb.buf); + die(_("ignoring unknown color-moved-ws mode '%s'"), sb.buf); strbuf_release(&sb); }
-- 2.19.0