From: Jeff King <peff@peff.net>
To: George King <george.w.king@gmail.com>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Stefan Beller" <sbeller@google.com>, git <git@vger.kernel.org>
Subject: Re: Difficulty with parsing colorized diff output
Date: Wed, 12 Dec 2018 08:52:55 -0500 [thread overview]
Message-ID: <20181212135255.GA5768@sigill.intra.peff.net> (raw)
In-Reply-To: <A97DD550-BE35-43BA-A181-708B7D065F3F@gmail.com>
On Tue, Dec 11, 2018 at 01:55:09PM -0500, George King wrote:
> I just noticed that while `wsErrorHighlight = none` fixes the problem
> of extra green codes for regular diff, it fails to have any effect
> during interactive `git add -p`.
This is due to the way add--interactive invokes diff. It uses the
plumbing commands (diff-tree, diff-files, etc), which do not respect
config which changes the output (since their purpose is to provide
stable machine-readable output).
But add--interactive does a slightly funny thing: it runs each diff
twice. Once to get the machine-readable version, and once to get a
colorized version which it shows to the user. When it does the latter,
it has to manually enable other options (e.g., passing --color as
appropriate, or passing along diff.algorithm).
So the matching behavior here would be for it to look as
wsErrorHighlight and pass it along as a command line option.
-Peff
next prev parent reply other threads:[~2018-12-12 13:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-08 0:09 Difficulty with parsing colorized diff output George King
2018-12-08 7:16 ` Jeff King
2018-12-11 3:26 ` Stefan Beller
2018-12-11 10:17 ` Jeff King
2018-12-11 14:47 ` George King
2018-12-11 16:28 ` Ævar Arnfjörð Bjarmason
2018-12-11 16:41 ` George King
2018-12-11 18:55 ` George King
2018-12-12 13:52 ` Jeff King [this message]
2018-12-12 12:49 ` 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
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=20181212135255.GA5768@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=avarab@gmail.com \
--cc=george.w.king@gmail.com \
--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).