From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: peff@peff.net, strk@kbt.io
Subject: [PATCH 0/4] diff.wsErrorHighlight configuration variable
Date: Tue, 4 Oct 2016 15:54:45 -0700 [thread overview]
Message-ID: <20161004225449.6759-1-gitster@pobox.com> (raw)
In-Reply-To: <xmqqk2douhe0.fsf@gitster.mtv.corp.google.com>
"git diff" and its family of commands have "--ws-error-highlight"
option to allow whitespace breakages on old and context lines
painted in color.diff.whitespace color, instead of the usual "we
paint breakages only on new lines", but there wasn't a configuration
variable that corresponds to it.
This would be a lot closer to a series that could be acceptable,
compared to the previous "it should look like this" patch.
Junio C Hamano (4):
t4015: split out the "setup" part of ws-error-highlight test
diff.c: refactor parse_ws_error_highlight()
diff.c: move ws-error-highlight parsing helpers up
diff: introduce diff.wsErrorHighlight option
Documentation/diff-config.txt | 6 +++
Documentation/diff-options.txt | 2 +
diff.c | 88 ++++++++++++++++++++++++++----------------
t/t4015-diff-whitespace.sh | 74 ++++++++++++++++++++++++++---------
4 files changed, 118 insertions(+), 52 deletions(-)
--
2.10.1-510-g1ef781f2c1
next prev parent reply other threads:[~2016-10-04 22:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-04 8:14 color.diff.whitespace unused on removed lines Sandro Santilli
2016-10-04 15:29 ` Jeff King
2016-10-04 15:35 ` Sandro Santilli
2016-10-04 16:13 ` Jeff King
2016-10-04 17:57 ` Junio C Hamano
2016-10-04 22:54 ` Junio C Hamano [this message]
2016-10-04 22:54 ` [PATCH 1/4] t4015: split out the "setup" part of ws-error-highlight test Junio C Hamano
2016-10-04 22:54 ` [PATCH 2/4] diff.c: refactor parse_ws_error_highlight() Junio C Hamano
2016-10-04 22:54 ` [PATCH 3/4] diff.c: move ws-error-highlight parsing helpers up Junio C Hamano
2016-10-04 22:54 ` [PATCH 4/4] diff: introduce diff.wsErrorHighlight option Junio C Hamano
2016-10-18 11:01 ` [PATCH 0/4] diff.wsErrorHighlight configuration variable Jeff King
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=20161004225449.6759-1-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=strk@kbt.io \
/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 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 NNTP newsgroup(s).