All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: Johannes.Schindelin@gmx.de, Stefan Beller <sbeller@google.com>
Subject: [PATCH 3/8] diff.c: simplify caller of emit_line_0
Date: Fri, 27 Jul 2018 20:04:43 -0700	[thread overview]
Message-ID: <20180728030448.192177-4-sbeller@google.com> (raw)
In-Reply-To: <20180728030448.192177-1-sbeller@google.com>

Due to the previous condition we know "set_sign != NULL" at that point.

Signed-off-by: Stefan Beller <sbeller@google.com>
---
 diff.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/diff.c b/diff.c
index 272b0b93834..f7251c89cbb 100644
--- a/diff.c
+++ b/diff.c
@@ -997,8 +997,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.345.g5c9ce644c3-goog


  parent reply	other threads:[~2018-07-28  3:05 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-28  3:04 [PATCH 0/8] Add color test for range-diff, simplify diff.c Stefan Beller
2018-07-28  3:04 ` [PATCH 1/8] test_decode_color: understand FAINT and ITALIC Stefan Beller
2018-07-28  3:04 ` [PATCH 2/8] t3206: add color test for range-diff --dual-color Stefan Beller
2018-07-28  6:27   ` Eric Sunshine
2018-07-30 19:55     ` Stefan Beller
2018-07-28  3:04 ` Stefan Beller [this message]
2018-07-28  3:04 ` [PATCH 4/8] diff.c: reorder arguments for emit_line_ws_markup Stefan Beller
2018-07-28  3:04 ` [PATCH 5/8] diff.c: add set_sign to emit_line_0 Stefan Beller
2018-07-28  6:30   ` Eric Sunshine
2018-07-28  3:04 ` [PATCH 6/8] diff: use emit_line_0 once per line Stefan Beller
2018-07-28  3:04 ` [PATCH 7/8] diff.c: compute reverse locally in emit_line_0 Stefan Beller
2018-07-28  3:04 ` [PATCH 8/8] diff.c: rewrite emit_line_0 more understandably Stefan Beller
2018-07-28  6:33   ` Eric Sunshine
2018-07-31  0:31 ` [PATCHv2 0/8] Add color test for range-diff, simplify diff.c Stefan Beller
2018-07-31  0:31   ` [PATCH 1/8] test_decode_color: understand FAINT and ITALIC Stefan Beller
2018-07-31  0:31   ` [PATCH 2/8] t3206: add color test for range-diff --dual-color Stefan Beller
2018-07-31 20:51     ` Junio C Hamano
2018-07-31  0:31   ` [PATCH 3/8] diff.c: simplify caller of emit_line_0 Stefan Beller
2018-07-31  0:31   ` [PATCH 4/8] diff.c: reorder arguments for emit_line_ws_markup Stefan Beller
2018-07-31  0:31   ` [PATCH 5/8] diff.c: add set_sign to emit_line_0 Stefan Beller
2018-07-31  0:31   ` [PATCH 6/8] diff: use emit_line_0 once per line Stefan Beller
2018-07-31  0:31   ` [PATCH 7/8] diff.c: compute reverse locally in emit_line_0 Stefan Beller
2018-07-31  0:31   ` [PATCH 8/8] diff.c: rewrite emit_line_0 more understandably Stefan Beller
2018-08-01 19:13   ` [PATCHv2 0/8] Add color test for range-diff, simplify diff.c Junio C Hamano
2018-08-01 19:46     ` Stefan Beller
2018-08-02 15:48       ` Junio C Hamano
2018-08-10 22:34 [PATCH 0/8] Resending sb/range-diff-colors Stefan Beller
2018-08-10 22:34 ` [PATCH 3/8] diff.c: simplify caller of emit_line_0 Stefan Beller
2018-08-13 12:07   ` Johannes Schindelin
2018-08-14  1:41 ` [PATCHv2 0/8] Resending sb/range-diff-colors Stefan Beller
2018-08-14  1:41   ` [PATCH 3/8] diff.c: simplify caller of emit_line_0 Stefan Beller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180728030448.192177-4-sbeller@google.com \
    --to=sbeller@google.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.