From: Junio C Hamano <gitster@pobox.com>
To: Neil Horman <nhorman@tuxdriver.com>
Cc: git@vger.kernel.org
Subject: Re: odd behavior with git-rebase
Date: Fri, 23 Mar 2012 13:33:30 -0700 [thread overview]
Message-ID: <7vvclvrrad.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20120323185205.GA11916@hmsreliant.think-freely.org> (Neil Horman's message of "Fri, 23 Mar 2012 14:52:05 -0400")
Neil Horman <nhorman@tuxdriver.com> writes:
> I know that git cherry-pick allows for picking of empty commits, and it appears
> the rebase script uses cherry-picking significantly, so I'm not sure why this
> isn't working, or if its explicitly prevented from working for some reason.
The primary purpose of "rebase" is (or at least was when it was conceived)
to clean up the existing history, and a part of the cleaning up is not to
replay a patch that ends up being empty. Even though we try to omit an
already applied patch by using "git cherry" internally when choosing which
commits to replay, a commit that by itself is *not* empty could end up
being empty when a similar change has already been made to the updated
base, and we do want to omit them.
A commit that is empty (i.e. --allow-empty) by itself was a much later
invention than the basic rebase logic, and the rebase may want to be
updated to special case it, but as the default behaviour it is doing the
right thing by not letting an empty commit into the cleaned up history.
next prev parent reply other threads:[~2012-03-23 20:34 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
2012-03-23 20:33 ` Junio C Hamano [this message]
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=7vvclvrrad.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=nhorman@tuxdriver.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).