git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
From: Stefan Beller <sbeller@google.com>
To: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Jun 2017, #06; Thu, 22)
Date: Fri, 23 Jun 2017 16:39:55 -0700
Message-ID: <CAGZ79kZyMUKPahTXOF7ds6zSvFKLrM2N78JKG-2+GRL5nnmuvA@mail.gmail.com> (raw)
In-Reply-To: <871sqajrgi.fsf@gmail.com>

On Fri, Jun 23, 2017 at 2:59 PM, Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
>
> On Thu, Jun 22 2017, Junio C. Hamano jotted:
>
>> * sb/diff-color-move (2017-06-21) 25 commits
>>  - diff: document the new --color-moved setting
>>  - diff.c: add dimming to moved line detection
>>  - diff.c: color moved lines differently, plain mode
>>  - diff.c: color moved lines differently
>>  - diff.c: buffer all output if asked to
>>  - diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARY
>>  - diff.c: emit_diff_symbol learns about DIFF_SYMBOL_STAT_SEP
>>  - diff.c: convert word diffing to use emit_diff_symbol
>>  - diff.c: convert show_stats to use emit_diff_symbol
>>  - diff.c: convert emit_binary_diff_body to use emit_diff_symbol
>>  - submodule.c: migrate diff output to use emit_diff_symbol
>>  - diff.c: emit_diff_symbol learns DIFF_SYMBOL_REWRITE_DIFF
>>  - diff.c: emit_diff_symbol learns about DIFF_SYMBOL_BINARY_FILES
>>  - diff.c: emit_diff_symbol learns DIFF_SYMBOL_HEADER
>>  - diff.c: emit_diff_symbol learns DIFF_SYMBOL_FILEPAIR
>>  - diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_INCOMPLETE
>>  - diff.c: emit_diff_symbol learns DIFF_SYMBOL_WORDS{_PORCELAIN}
>>  - diff.c: migrate emit_line_checked to use emit_diff_symbol
>>  - diff.c: emit_diff_symbol learns DIFF_SYMBOL_NO_LF_EOF
>>  - diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_FRAGINFO
>>  - diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_MARKER
>>  - diff.c: introduce emit_diff_symbol
>>  - diff.c: factor out diff_flush_patch_all_file_pairs
>>  - diff.c: move line ending check into emit_hunk_header
>>  - diff.c: readability fix
>>
>>  "git diff" has been taught to optionally paint new lines that are
>>  the same as deleted lines elsewhere differently from genuinely new
>>  lines.
>>
>>  Is any more update coming?
>
> I guess here's as good a place for feedback is any, this feature's
> great, but I discovered some minor warts in it:

Thanks for reporting these. :)

So:
* have the boolean option as below
* fix error modes in config
* rewrite documentation for lazy skimming readers :)

I also consider
* changing the default to zebra (instead of dimmed_zebra)

Junio wrote (when reviewing Michaels series)
> This patch shows OK, but when applied to other changes in the
> series, e.g. "packed_ref_store: make class into a subclass of
> `ref_store`", it was somewhat irritating that all new blank lines
> are shown as a copy-move of a single deleted blank line (also a
> single "return refs" in an entirely new function being a copy/move
> looked confusing).

* add some heuristic to omit small blobs, (empty lines, closing braces)
  Maybe this is can be solved by not considering anything
  that occurs multiple times?

  reply index

Thread overview: 12+ messages in thread (expand / mbox.gz / Atom feed / [top])
2017-06-22 22:35 Junio C Hamano
2017-06-22 22:58 ` Ævar Arnfjörð Bjarmason
2017-06-23  5:28   ` Junio C Hamano
2017-06-24  0:27     ` Junio C Hamano
2017-06-23  9:43 ` Lars Schneider
2017-06-23 21:59 ` Ævar Arnfjörð Bjarmason
2017-06-23 23:39   ` Stefan Beller [this message]
2017-06-24  0:37     ` Junio C Hamano
2017-06-24  1:01       ` Junio C Hamano
2017-06-27  2:58         ` Stefan Beller
2017-06-24  0:16   ` Stefan Beller
2017-06-24  0:33   ` Junio C Hamano

Reply instructions:

You may reply publically 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 to all the recipients using the --to, --cc,
  and --in-reply-to switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAGZ79kZyMUKPahTXOF7ds6zSvFKLrM2N78JKG-2+GRL5nnmuvA@mail.gmail.com \
    --to=sbeller@google.com \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox