From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, win@wincent.com
Subject: Re: [BUG] git-diff-* --color oddness
Date: Fri, 4 Jan 2008 03:43:46 -0500 [thread overview]
Message-ID: <20080104084345.GA3472@coredump.intra.peff.net> (raw)
In-Reply-To: <7v63yam1i9.fsf@gitster.siamese.dyndns.org>
On Fri, Jan 04, 2008 at 12:35:42AM -0800, Junio C Hamano wrote:
> What I meant is "git diff" without --color can be colorized
> because of config but we should never allow "git diff-files"
> without --color to be colorized by user's config. I realize
> that you were talking about the choice of colors, which is a
> different issue.
>
> I do not much care ;-), but I guess we would want to be
> consistent.
OK, yes, I knew that about diff.color already. But I think it is a bug
to not use the user's colors in "git add -i", and I think the right fix
is to make diff-files consistent in its color choices. Patch will
follow.
> That one _is_ a bug. diff-files should not be affected by
> "diff.color = auto" or somesuch in the config, even when the
> user uses custom function header crap.
It doesn't use it, actually, but I think that is a happy accident of the
way most config options are used (i.e., we _do_ read and change the
config, but we just never look at it again because we have done our
diff_setup). If you could provoke any of the diff plumbing to call
diff_setup twice, you would be in trouble (but even diff-tree --stdin
doesn't do that).
-Peff
next prev parent reply other threads:[~2008-01-04 8:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-04 8:14 [BUG] git-diff-* --color oddness Jeff King
2008-01-04 8:24 ` Junio C Hamano
2008-01-04 8:28 ` Jeff King
2008-01-04 8:35 ` Junio C Hamano
2008-01-04 8:43 ` Jeff King [this message]
2008-01-04 8:26 ` Junio C Hamano
2008-01-04 8:32 ` Jeff King
2008-01-04 8:46 ` Junio C Hamano
2008-01-04 8:59 ` Jeff King
2008-01-04 9:25 ` Jeff King
2008-01-04 9:37 ` Junio C Hamano
2008-01-04 9:45 ` 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=20080104084345.GA3472@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=win@wincent.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.