Re: 1.8.4 rebase regression?

2013-09-17 Thread Matthieu Moy
Patrick Welche writes: > On Tue, Sep 17, 2013 at 11:23:51AM +0200, Matthieu Moy wrote: >> Patrick Welche writes: >> >> > 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 re

Re: 1.8.4 rebase regression?

2013-09-17 Thread Patrick Welche
On Tue, Sep 17, 2013 at 11:23:51AM +0200, Matthieu Moy wrote: > Patrick Welche writes: > > > 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

Re: 1.8.4 rebase regression?

2013-09-17 Thread Matthieu Moy
Patrick Welche writes: > 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 >

Re: 1.8.4 rebase regression?

2013-09-17 Thread Patrick Welche
On Tue, Sep 17, 2013 at 09:15:43AM +0200, Matthieu Moy wrote: > Matthieu Moy writes: > > > Patrick Welche writes: > > > >> $ git diff > >> ESC[1mdiff --cc glib/gmain.cESC[m > >> ESC[1mindex 738e69c,5aaebd0..000ESC[m > >> ESC[1m--- a/glib/gmain.cESC[m > >> ESC[1m+++ b/glib/gmain.cESC[m > >> E

Re: 1.8.4 rebase regression?

2013-09-17 Thread Patrick Welche
On Mon, Sep 16, 2013 at 01:18:48PM +0200, Matthieu Moy wrote: > Patrick Welche writes: > > > $ git diff > > ESC[1mdiff --cc glib/gmain.cESC[m > > ESC[1mindex 738e69c,5aaebd0..000ESC[m > > ESC[1m--- a/glib/gmain.cESC[m > > ESC[1m+++ b/glib/gmain.cESC[m > > ESC[36m@@@ -4953,32 -4921,32 +4953,48

Re: 1.8.4 rebase regression?

2013-09-17 Thread Matthieu Moy
Matthieu Moy writes: > Patrick Welche writes: > >> $ git diff >> ESC[1mdiff --cc glib/gmain.cESC[m >> ESC[1mindex 738e69c,5aaebd0..000ESC[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_dispatc

Re: 1.8.4 rebase regression?

2013-09-16 Thread Matthieu Moy
Patrick Welche writes: > $ git diff > ESC[1mdiff --cc glib/gmain.cESC[m > ESC[1mindex 738e69c,5aaebd0..000ESC[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,

Re: 1.8.4 rebase regression?

2013-09-16 Thread Patrick Welche
On Mon, Sep 16, 2013 at 09:52:35AM +0200, Matthieu Moy wrote: > Patrick Welche writes: > > > I just upgraded (via pkgsrc) from git 1.8.3.4 to 1.8.4. With 1.8.4, I had > > local changes in glib, did a git pull --rebase. Some of my changes > > conflicted, but > > > > $ git rebase --abort > > No reb

Re: 1.8.4 rebase regression?

2013-09-16 Thread Matthieu Moy
Patrick Welche writes: > I just upgraded (via pkgsrc) from git 1.8.3.4 to 1.8.4. With 1.8.4, I had > local changes in glib, did a git pull --rebase. Some of my changes > conflicted, but > > $ git rebase --abort > No rebase in progress? > > so somehow the usual process of amending the edit, or ski

1.8.4 rebase regression?

2013-09-15 Thread Patrick Welche
I just upgraded (via pkgsrc) from git 1.8.3.4 to 1.8.4. With 1.8.4, I had local changes in glib, did a git pull --rebase. Some of my changes conflicted, but $ git rebase --abort No rebase in progress? so somehow the usual process of amending the edit, or skipping the patch no longer works. I fou