Git development
 help / color / mirror / Atom feed
From: Mark Blakeney <markb@berlios.de>
To: git@vger.kernel.org
Subject: git rebase stops on empty commits
Date: Wed, 22 Jul 2009 17:22:13 +1000	[thread overview]
Message-ID: <33e2b2760907220022rbad30d7x255bcb63c5b8cc2f@mail.gmail.com> (raw)

I am new to git but think I have found a bug. I searched the git archives
and found the same issue reported by Michael Gruber about 1 year ago but it
was discounted by Stephan Beyer and the problem seems to be forgotten about.

See http://kerneltrap.org/mailarchive/git/2008/7/8/2388804

In short, I think git rebase needs a "--allow-empty" option. I have git
repo which I converted from an old system and which for various reasons
requires me to --allow-empty commits when I build it. The repo has about
3300 commits but now when I try to fix up some of the early commit
comments using git rebase -i I find I have to manually sit at the
terminal and dumbly type;

    git commit --allow-empty (then quit out of editor)
    git rebase --continue

ad nauseum for all the many empty commits ...

I'm only rebasing to change some commit messages which must be a trivial
git operation. Surely git rebase -i should be able to be told to
continue through empty commits itself? At the very least some kind of
message to the user would help - I only found that git commit
--allow-empty works around this rebase problem once I found the old
post above.

I am using the latest version 1.6.3.3 of git. This is the version used
to build the repo from scratch and for the git rebase -i etc.

--
Mark Blakeney

             reply	other threads:[~2009-07-22  7:28 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-22  7:22 Mark Blakeney [this message]
2009-07-22  7:44 ` git rebase stops on empty commits Mark Blakeney
2009-07-22  8:08   ` Peter Krefting
2009-07-22 12:29     ` Mark Blakeney
2009-07-22 22:08       ` Nanako Shiraishi
2009-07-22 23:01         ` Mark Blakeney

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=33e2b2760907220022rbad30d7x255bcb63c5b8cc2f@mail.gmail.com \
    --to=markb@berlios.de \
    --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