From: Felipe Contreras <felipe.contreras@gmail.com>
To: Martin von Zweigbergk <martinvonz@gmail.com>
Cc: git <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [RFC/PATCH v2 2/8] rebase: cherry-pick: fix mode storage
Date: Wed, 29 May 2013 00:45:23 -0500 [thread overview]
Message-ID: <CAMP44s29KwDMwF2X+_Lu7nyUaTkQAwC9pAx1nGNBe+WoktVGjA@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2013-05-29 5:45 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-29 4:16 [RFC/PATCH v2 0/8] rebase: new cherry-pick mode Felipe Contreras
2013-05-29 4:16 ` [RFC/PATCH v2 1/8] rebase: split the cherry-pick stuff Felipe Contreras
2013-05-29 4:16 ` [RFC/PATCH v2 2/8] rebase: cherry-pick: fix mode storage Felipe Contreras
2013-05-29 5:38 ` Martin von Zweigbergk
2013-05-29 5:45 ` Felipe Contreras [this message]
2013-05-29 4:16 ` [RFC/PATCH v2 3/8] rebase: cherry-pick: fix sequence continuation Felipe Contreras
2013-05-29 5:33 ` Martin von Zweigbergk
2013-05-29 5:41 ` Felipe Contreras
2013-05-29 5:51 ` Martin von Zweigbergk
2013-05-29 6:05 ` Felipe Contreras
2013-05-29 6:06 ` Martin von Zweigbergk
2013-05-29 4:16 ` [RFC/PATCH v2 4/8] rebase: cherry-pick: fix abort of cherry mode Felipe Contreras
2013-05-29 5:35 ` Martin von Zweigbergk
2013-05-29 5:47 ` Felipe Contreras
2013-05-29 11:13 ` Stefano Lattarini
2013-05-29 4:16 ` [RFC/PATCH v2 5/8] rebase: cherry-pick: fix command invocations Felipe Contreras
2013-05-29 4:16 ` [RFC/PATCH v2 6/8] rebase: cherry-pick: fix status messages Felipe Contreras
2013-05-29 4:16 ` [RFC/PATCH v2 7/8] rebase: cherry-pick: automatically commit stage Felipe Contreras
2013-05-29 4:16 ` [RFC/PATCH v2 8/8] rebase: use 'cherrypick' mode instead of 'am' Felipe Contreras
2013-05-29 23:23 ` [RFC/PATCH v2 0/8] rebase: new cherry-pick mode Junio C Hamano
2013-05-30 2:37 ` Felipe Contreras
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=CAMP44s29KwDMwF2X+_Lu7nyUaTkQAwC9pAx1nGNBe+WoktVGjA@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martinvonz@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).