From: Mike Hommey <mh@glandium.org>
To: git@vger.kernel.org
Subject: git rebase bug?
Date: Wed, 7 Jul 2010 17:05:45 +0200 [thread overview]
Message-ID: <20100707150545.GA24814@glandium.org> (raw)
Hi,
I got a really weird result from a rebase today, and I'm wondering if
that's a corner case or if that could be considered a bug in rebase.
This is reproducible with the following setup:
$ git clone git://git.debian.org/pkg-mozilla/xulrunner/experimental xulrunner-1.9.2
$ cd xulrunner-1.9.2
$ git remote add upstream git://git.debian.org/pkg-mozilla/upstream
$ git fetch upstream xulrunner/2.0:xulrunner/2.0
$ git checkout -b test upstream/1.9.2.4
$ git cherry-pick 67e469ef725ac3f4cdf043809066c353e6843db4
The patch that is cherry picked here has the following stats:
security/manager/ssl/public/Makefile.in | 1 +
security/manager/ssl/public/nsIBadCertListener.idl | 155 ++++++++++++++++++++
security/manager/ssl/src/nsNSSIOLayer.cpp | 103 +++++++++++++-
security/manager/ssl/src/nsNSSIOLayer.h | 8 +
$ git rebase --onto xulrunner/2.0 upstream/1.9.2.4 test
The resulting commit has the following stats:
security/manager/ssl/public/Makefile.in | 1 +
security/manager/ssl/src/nsNSSIOLayer.cpp | 103 ++++++++++++++++-
security/manager/ssl/src/nsNSSIOLayer.h | 8 ++
xulrunner/examples/simple/content/contents.rdf | 155 ++++++++++++++++++++++++
See how the security/manager/ssl/public/nsIBadCertListener.idl file that
was created by the original patch is created as
xulrunner/examples/simple/content/contents.rdf.
Please note that as the xulrunner/2.0 commit has no parent, I also tried
grafting it on top of upstream/1.9.2.4, which didn't change anything.
So, corner case or definite bug?
Cheers,
Mike
PS: this all is with current master
next reply other threads:[~2010-07-07 15:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-07 15:05 Mike Hommey [this message]
2010-07-07 18:00 ` git rebase bug? Björn Steinbrink
2010-07-07 20:51 ` Mike Hommey
2010-07-07 21:44 ` Jakub Narebski
2010-07-08 9:47 ` Mike Hommey
2010-07-08 11:37 ` 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=20100707150545.GA24814@glandium.org \
--to=mh@glandium.org \
--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).