From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Linux Kernel <linux-kernel@vger.kernel.org>,
Jeff King <peff@peff.net>
Subject: Re: [ANNOUNCE] Git v2.3.0-rc0
Date: Tue, 20 Jan 2015 22:49:32 +0100 [thread overview]
Message-ID: <CACBZZX5s1rZ3exktbisseJSjF8-0=8ByMpBpARy6h+=iP7wEyA@mail.gmail.com> (raw)
In-Reply-To: <xmqqmw5n5z8i.fsf@gitster.dls.corp.google.com>
On Tue, Jan 13, 2015 at 12:57 AM, Junio C Hamano <gitster@pobox.com> wrote:
> An early preview release Git v2.3.0-rc0 is now available for
> testing at the usual places.
[...]
> Jeff King (38):
[...]
> parse_color: refactor color storage
[...]
I've had this in my .gitconfig since 2010 which was broken by Jeff's
v2.1.3-24-g695d95d:
;; Don't be so invasive about coloring ^M when I'm editing files
that
;; are supposed to have \r\n.
[color "diff"]
whitespace = 0
To test this replace \n with \r\n in a file. Before this patch you could do:
git -c color.diff.whitespace=0 show
And just get:
[red]-[/red]
[green]+[/green]
As opposed to:
git -c color.diff.whitespace=1 show
Which gives you:
[red]-
[green]+[/green][red]^M[/red]
Now that just produces:
error: invalid color value: 0
fatal: bad config variable 'color.diff.whitespace' in file
'/home/avar/.gitconfig' at line 16
Maybe breaking this is OK (but I can't find what the replacement is),
but the config or the the changelog doesn't mention breaking existing
config settings.
next prev parent reply other threads:[~2015-01-20 21:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-12 23:57 [ANNOUNCE] Git v2.3.0-rc0 Junio C Hamano
2015-01-14 13:11 ` Christian Neukirchen
2015-01-20 21:49 ` Ævar Arnfjörð Bjarmason [this message]
2015-01-20 22:14 ` [PATCH] parse_color: fix return value for numeric color values 0-8 Jeff King
2015-01-20 23:57 ` Junio C Hamano
2015-01-21 0:03 ` Jeff King
2015-01-21 0:36 ` Junio C Hamano
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='CACBZZX5s1rZ3exktbisseJSjF8-0=8ByMpBpARy6h+=iP7wEyA@mail.gmail.com' \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peff@peff.net \
/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).