From: Jeff King <peff@peff.net>
To: Phil Hord <phil.hord@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>, git@vger.kernel.org
Subject: Re: odd behavior with git-rebase
Date: Mon, 26 Mar 2012 15:56:19 -0400 [thread overview]
Message-ID: <20120326195619.GB13098@sigill.intra.peff.net> (raw)
In-Reply-To: <CABURp0qeJEwELpg_YKxn9Ghb6EMphrwwfueM2XCqua3X_dacdA@mail.gmail.com>
On Mon, Mar 26, 2012 at 02:31:05PM -0400, Phil Hord wrote:
> 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.
This is easily reproducible on a simple test case:
commit() {
echo $1 >$1 && git add $1 && git commit -m $1 && git tag $1
}
git init repo &&
cd repo &&
commit one &&
commit two &&
git commit --allow-empty -m empty &&
commit three &&
git checkout -b fork one &&
commit four &&
git rebase -i fork master
git --no-pager log --oneline
(this is the same test case I used without "-i" to check the rebase
skipping behavior).
I agree the mention of cherry-pick is a little confusing. I think the
advice to use "git commit --allow-empty" is still the right thing
(although better still would be to recognize that the commit was empty
in the first place and not stop at all). I think the message is showing
the fact that "rebase -i" is cobbled together from other pieces. I
wonder if the sequencer work would make this a little smoother (I
confess I have not paid much attention to what is happening in that
area).
-Peff
next prev parent reply other threads:[~2012-03-26 19:56 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
2012-03-26 19:56 ` Jeff King [this message]
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=20120326195619.GB13098@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=phil.hord@gmail.com \
/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).