From: Neil Horman <nhorman@tuxdriver.com>
To: Phil Hord <phil.hord@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: odd behavior with git-rebase
Date: Mon, 26 Mar 2012 16:04:18 -0400 [thread overview]
Message-ID: <20120326200418.GC12843@hmsreliant.think-freely.org> (raw)
In-Reply-To: <CABURp0oJwM-KtdBRVHgvOaqFVjA-MEAfJoJH=52Y=QRcgFL+3Q@mail.gmail.com>
On Mon, Mar 26, 2012 at 02:29:24PM -0400, Phil Hord wrote:
> On Mon, Mar 26, 2012 at 1:12 PM, Junio C Hamano <gitster@pobox.com> wrote:
> > Neil Horman <nhorman@tuxdriver.com> writes:
> >
> >> Is there a way to differentiate a commit that is made empty as the result of a
> >> previous patch in the rebase, and a commit that is simply empty?
> >
> > An empty commit has the same tree object as its parent commit.
> >
> >> I agree, I think perhaps adding an --allow-empty option to the rebase logic, so
> >> that empty commits (or perhaps just initially empty, as opposed to commits made
> >> empty) would be very beneficial.
> >
> > Yeah, that probably may make sense.
>
>
> Can we have three behaviors?
>
> A: Current mode, stop and error on empty commits
> B: --keep-empty, to retain empty commits without further notice
> C: --purge-empty, to remove empty commits without further notice
>
Yeah, I've got most of --keep-empty in a private branch here now. I was calling
it allow-empty, but given (C) above, I like --keep-empty better.
I'll add --purge-empty to me todo list. and augment the rebase code to pass
these options along.
One more question - The options for cherry-pick are currently mostly merged with
git revert. Are there any opinions on the applicability of
--keep-empty/--purge-empty to reverts?
Regards
Neil
next prev parent reply other threads:[~2012-03-26 20:04 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
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 [this message]
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=20120326200418.GC12843@hmsreliant.think-freely.org \
--to=nhorman@tuxdriver.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).