range-diff --dual-color: skip white-space warnings
When displaying a diff of diffs, it is possible that there is an outer `+` before a context line. That happens when the context changed between old and new commit. When that context line starts with a tab (after the space that marks it as context line), our diff machinery spits out a white-space error (space before tab), but in this case, that is incorrect. Rather than adding a specific whitespace flag that specifically ignores the first space in the output (and might miss other problems with the white-space warnings), let's just skip handling white-space errors in dual color mode to begin with. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Aug 13, 2018 at 04:33 UTC
0b91faa010e438c4e0a58706573f3777da86ecde
1 file changed
+1
diff.c
+1
@@ -1299,6 +1299,7 @@ static void emit_diff_symbol_from_struct(struct diff_options *o,
1299
set = diff_get_color_opt(o, DIFF_FRAGINFO);
1300
else if (c != '+')
1301
set = diff_get_color_opt(o, DIFF_CONTEXT);
1302
+ flags &= ~DIFF_SYMBOL_CONTENT_WS_MASK;
1303
}
1304
emit_line_ws_markup(o, set, reset, line, len, set_sign, '+',
1305
flags & DIFF_SYMBOL_CONTENT_WS_MASK,