git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Eric Sunshine <sunshine@sunshineco.com>
To: Stefan Beller <sbeller@google.com>
Cc: Git List <git@vger.kernel.org>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH 8/8] diff.c: rewrite emit_line_0 more understandably
Date: Sat, 28 Jul 2018 02:33:58 -0400	[thread overview]
Message-ID: <CAPig+cQHPCeOigVoe1jOMuvKGTV-UgdNCTk+OyD1sBuGQJADRg@mail.gmail.com> (raw)
In-Reply-To: <20180728030448.192177-9-sbeller@google.com>

On Fri, Jul 27, 2018 at 11:05 PM Stefan Beller <sbeller@google.com> wrote:
> emit_line_0 has no nested conditions, but puts out all its arguments
> (if set) in order. There is still a slight confusion with set
> and set_sign, but let's defer that to a later patch.
>
> 'first' used be output always no matter if it was 0, but that got lost
> got lost at e8c285c4f9c (diff: add an internal option to dual-color
> diffs of diffs, 2018-07-21), as there we broadened the meaning of 'first'
> to also signal an early return.

s/used be/used to be/

redundant "got lost"

> The change in 'emit_line' makes sure that 'first' is never content, but
> always under our control, a sign or special character in the beginning
> of the line (or 0, in which case we ignore it).
>
> Signed-off-by: Stefan Beller <sbeller@google.com>

  reply	other threads:[~2018-07-28  6:34 UTC|newest]

Thread overview: 30+ 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 ` [PATCH 3/8] diff.c: simplify caller of emit_line_0 Stefan Beller
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 [this message]
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
  -- strict thread matches above, loose matches on Subject: below --
2018-08-10 22:34 [PATCH 0/8] Resending sb/range-diff-colors Stefan Beller
2018-08-10 22:34 ` [PATCH 8/8] diff.c: rewrite emit_line_0 more understandably Stefan Beller
2018-08-13 12:42   ` Johannes Schindelin
2018-08-13 18:57     ` Stefan Beller
2018-08-14  1:41 ` [PATCHv2 0/8] Resending sb/range-diff-colors Stefan Beller
2018-08-14  1:41   ` [PATCH 8/8] diff.c: rewrite emit_line_0 more understandably 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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=CAPig+cQHPCeOigVoe1jOMuvKGTV-UgdNCTk+OyD1sBuGQJADRg@mail.gmail.com \
    --to=sunshine@sunshineco.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=sbeller@google.com \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).