From: Stefan Beller Date: Fri, 10 Aug 2018 22:34:36 GMT Subject: [PATCH 3/8] diff.c: simplify caller of emit_line_0 Message-ID: <20180810223441.30428-4-sbeller@google.com> In-Reply-To: <20180810223441.30428-1-sbeller@google.com> Due to the previous condition we know "set_sign != NULL" at that point. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- diff.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/diff.c b/diff.c index ae131495216..f6df18af913 100644 --- 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 */ -- 2.18.0.865.gffc8e1a3cd6-goog