From: Phil Hord <phil.hord@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Neil Horman <nhorman@tuxdriver.com>, git@vger.kernel.org
Subject: Re: odd behavior with git-rebase
Date: Mon, 26 Mar 2012 14:31:05 -0400 [thread overview]
Message-ID: <CABURp0qeJEwELpg_YKxn9Ghb6EMphrwwfueM2XCqua3X_dacdA@mail.gmail.com> (raw)
In-Reply-To: <20120323195455.GB15063@sigill.intra.peff.net>
On Fri, Mar 23, 2012 at 3:54 PM, Jeff King <peff@peff.net> wrote:
> On Fri, Mar 23, 2012 at 02:52:05PM -0400, Neil Horman wrote:
>
>> I hit a strange problem with git rebase and I can't quite decide if its
>> a design point of the rebase command, or if its happening in error. When doing
>> upstream backports of various kernel components I occasionally run accross
>> commits that, for whatever reason, I don't want/need or can't backport. When
>> that happens, I insert an empty commit in my history noting the upstream commit
>> hash and the reasoning behind why I skipped it (I use git commit -c <hash>
>> --allow-empty). If I later rebase this branch, I note that all my empty commits
>> fail indicating the commit cannot be applied. I can of course do another git
>> commit --allow-empty -c <hash>; git rebase --continue, and everything is fine,
>> but I'd rather it just take the empty commit in the rebase if possible.
>
> I think it is even odder than that. If you use plain rebase, the empty
> commits are silently omitted. If you do an interactive rebase, you get
> the "could not apply" message (and just doing a "continue" creates some
> funny error messages and ends up omitting the commit).
Coincidentally I ran into this same behavior this week. But what
bothered me about it was the messages git gave me. The empty commit
gave me cherry-pick hints instead of rebase ones, including advising
me to "use 'git reset'" to resolve the problem if I don't want this
commit after all.
$ git rebase -i HEAD~10
...
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git reset'
# Not currently on any branch.
nothing to commit (working directory clean)
Could not apply d513504... Some commit message
I'm not sure if this is the norm or if it's a result of some other
things I did in this sequence. But I've seen it several times now.
I've only tested it on 1.7.10 versions, including RC2.
Phil
next prev parent reply other threads:[~2012-03-26 18:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-23 18:52 odd behavior with git-rebase Neil Horman
2012-03-23 19:54 ` Jeff King
2012-03-26 18:31 ` Phil Hord [this message]
2012-03-26 19:56 ` Jeff King
2012-03-23 20:33 ` Junio C Hamano
2012-03-24 16:55 ` Neil Horman
2012-03-26 17:12 ` Junio C Hamano
2012-03-26 17:20 ` Neil Horman
2012-03-26 21:53 ` Neal Kreitzinger
2012-03-26 22:53 ` Phil Hord
[not found] ` <4F72AD25.2090102@gmail.com>
2012-03-28 6:58 ` Phil Hord
2012-03-28 17:08 ` Junio C Hamano
2012-03-26 18:29 ` Phil Hord
2012-03-26 20:04 ` Neil Horman
2012-03-27 1:58 ` Jay Soffian
2012-03-26 15:27 ` Neal Kreitzinger
2012-03-26 17:18 ` Neil Horman
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=CABURp0qeJEwELpg_YKxn9Ghb6EMphrwwfueM2XCqua3X_dacdA@mail.gmail.com \
--to=phil.hord@gmail.com \
--cc=git@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--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.
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).