diff.c: simplify caller of emit_line_0
authorStefan Beller <sbeller@google.com>
Tue, 14 Aug 2018 01:41:17 +0000 (18:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Aug 2018 21:03:05 +0000 (14:03 -0700)
Due to the previous condition we know "set_sign != NULL" at that point.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c
diff --git a/diff.c b/diff.c
index ae131495216a9346d038a21bb2a28b81d52ea605..f6df18af9132b8acab0de655dc8c0d3f5eeb3e1e 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1202,8 +1202,7 @@ static void emit_line_ws_markup(struct diff_options *o,
                emit_line_0(o, set, 0, reset, sign, line, len);
        else if (!ws) {
                /* Emit just the prefix, then the rest. */
-               emit_line_0(o, set_sign ? set_sign : set, !!set_sign, reset,
-                           sign, "", 0);
+               emit_line_0(o, set_sign, !!set_sign, reset, sign, "", 0);
                emit_line_0(o, set, 0, reset, 0, line, len);
        } else if (blank_at_eof)
                /* Blank line at EOF - paint '+' as well */