From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Wed, 29 May 2013 05:45:23 GMT
Subject: Re: [RFC/PATCH v2 2/8] rebase: cherry-pick: fix mode storage
Message-ID: <CAMP44s29KwDMwF2X+_Lu7nyUaTkQAwC9pAx1nGNBe+WoktVGjA@mail.gmail.com>
In-Reply-To: <CANiSa6jMb0D0ZYDMHtWD3u9tsY+kuX4Gcxu7L-=ZU3X3WPJzJg@mail.gmail.com>

On Wed, May 29, 2013 at 12:38 AM, Martin von Zweigbergk
<martinvonz@gmail.com> wrote:
> Actually, are all of 2/8 - 7/8 fixes for things that broke in patch 1/8?

No, everything is already broken.

Try this:

--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -78,7 +78,7 @@ state_dir=
 action=
 preserve_merges=
 autosquash=
-keep_empty=
+keep_empty=yes
 test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t

 read_basic_state () {

And tell me what happens when you run the test suite:

Hint: This[1] is what would happen; everything breaks, not only the
tests that check for empty commits.

[1] http://article.gmane.org/gmane.comp.version-control.git/225652

-- 
Felipe Contreras