From: Patrick Welche <prlw1@cam.ac.uk>
To: git@vger.kernel.org
Subject: 1.8.4 rebase regression?
Date: Mon, 16 Sep 2013 00:57:39 +0100 [thread overview]
Message-ID: <20130915235739.GA712@quark> (raw)
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 found a similar report at:
http://mail-index.netbsd.org/pkgsrc-users/2013/09/14/msg018646.html
Another less important regression is that in an xterm, with 1.8.3.4 I see
$ /tmp/bin/git diff
diff --cc glib/gmain.c
index 738e69c,5aaebd0..0000000
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@@ -4953,32 -4921,32 +4953,48 @@@ g_unix_signal_watch_dispatch (GSourc
}
...
but with 1.8.4, I see
$ 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?
Cheers,
Patrick
next reply other threads:[~2013-09-16 0:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-15 23:57 Patrick Welche [this message]
2013-09-16 7:52 ` 1.8.4 rebase regression? 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
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=20130915235739.GA712@quark \
--to=prlw1@cam.ac.uk \
--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 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 NNTP newsgroup(s).