From: Patrick Welche <prlw1@cam.ac.uk>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: git@vger.kernel.org
Subject: Re: 1.8.4 rebase regression?
Date: Tue, 17 Sep 2013 10:13:33 +0100 [thread overview]
Message-ID: <20130917091333.GB289@quark> (raw)
In-Reply-To: <vpqioy1815z.fsf@anie.imag.fr>
On Mon, Sep 16, 2013 at 01:18:48PM +0200, Matthieu Moy wrote:
> Patrick Welche <prlw1@cam.ac.uk> writes:
>
> > $ git diff
> > ESC[1mdiff --cc glib/gmain.cESC[m
> > ESC[1mindex 738e69c,5aaebd0..0000000ESC[m
> > ESC[1m--- a/glib/gmain.cESC[m
> > ESC[1m+++ b/glib/gmain.cESC[m
> > ESC[36m@@@ -4953,32 -4921,32 +4953,48 @@@ESC[m ESC[mg_unix_signal_watch_dispatch (GSourcESC[m
> >
> >
> > (same xterm, no change of TERM in both invocations above)
> > git status in 1.8.4 does show red, so colour does work...
> >
> > Thoughts on how to help debug?
>
> Can you try:
>
> git -c color.ui=never diff
> git -c color.ui=auto diff
> git -c color.ui=always diff
>
> ?
Got it: the change between 1.8.3.4 and 1.8.4 is that colour is on by
default. If I take 1.8.3.4 and git -c color.ui=always log, I see
the same ESC codes => not a regression! I'll just have to sort my
box out if I want colour. (The only oddity is that git status is
correctly colourful.)
(
> If you have a bit of time, you can use "git bisect" on a clone of
> git.git to find out the guilty commit.
commit e5be297279e8ee8c503eb59da21ab17edc40e748
Merge: a3bc3d0 6897a64
but that is presumably just when the default changed
)
Sorry for the confusion - it just looked like a regression to me,
but isn't!
Cheers,
Patrick
next prev parent reply other threads:[~2013-09-17 9:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-15 23:57 1.8.4 rebase regression? Patrick Welche
2013-09-16 7:52 ` Matthieu Moy
2013-09-16 10:28 ` Patrick Welche
2013-09-16 11:18 ` Matthieu Moy
2013-09-17 7:15 ` Matthieu Moy
2013-09-17 9:15 ` Patrick Welche
2013-09-17 9:13 ` Patrick Welche [this message]
2013-09-17 9:23 ` Matthieu Moy
2013-09-17 10:07 ` Patrick Welche
2013-09-17 10:59 ` Matthieu Moy
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=20130917091333.GB289@quark \
--to=prlw1@cam.ac.uk \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
/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.