Re: [PATCH 3/8] diff.c: simplify caller of emit_line_0
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Aug 13, 2018, 12:07 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1808131406371.71@tvgsbejvaqbjf.bet>
- In-Reply-To
- <20180810223441.30428-4-sbeller@google.com>
Hi Stefan,
On Fri, 10 Aug 2018, Stefan Beller wrote:
> Due to the previous condition we know "set_sign != NULL" at that point.
I trust your judgement on that, also on how likely this previous condition is to keep guaranteeing that assumption.
Thank you, Dscho
Show 24 quoted lines
> Signed-off-by: Stefan Beller <sbeller@google.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> 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
>
>