From: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Todd Zullinger <tmz@pobox.com>
Subject: [PATCH 1/2] rebase --root: demonstrate a bug while amending root commit messages
Date: Fri, 15 Jun 2018 00:31:11 -0400 [thread overview]
Message-ID: <d59805a43ddaf4bbd4528a2b7afa9809eca9b86b.1529177176.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.3.git.gitgitgadget@gmail.com>
From: Todd Zullinger <tmz@pobox.com>
When splitting a repository, running `git rebase -i --root` to reword
the initial commit, Git dies with
BUG: sequencer.c:795: root commit without message.
Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
t/t3404-rebase-interactive.sh | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index c65826dda..ca94c688d 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -971,6 +971,15 @@ test_expect_success 'rebase -i --root fixup root commit' '
test 0 = $(git cat-file commit HEAD | grep -c ^parent\ )
'
+test_expect_failure 'rebase -i --root reword root commit' '
+ test_when_finished "test_might_fail git rebase --abort" &&
+ git checkout -b reword-root-branch master &&
+ set_fake_editor &&
+ FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \
+ git rebase -i --root &&
+ git show HEAD^ | grep "A changed"
+'
+
test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-interactive rebase' '
git reset --hard &&
git checkout conflict-branch &&
--
2.17.0.windows.1
next prev parent reply other threads:[~2018-06-16 19:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-16 19:26 [PATCH 0/2] rebase --root: fix `reword` on a root commit Johannes Schindelin via GitGitGadget
2018-06-15 4:31 ` Johannes Schindelin via GitGitGadget [this message]
2018-06-18 10:25 ` [PATCH 1/2] rebase --root: demonstrate a bug while amending rootcommit messages Phillip Wood
2018-06-18 16:49 ` Todd Zullinger
2018-06-18 21:46 ` Johannes Schindelin
2018-06-18 22:19 ` [PATCH] t3404: check root commit in 'rebase -i --root reword root commit' Todd Zullinger
2018-06-19 6:54 ` Johannes Schindelin
2018-06-19 16:00 ` Junio C Hamano
2018-06-19 19:12 ` Todd Zullinger
2018-06-20 11:03 ` Johannes Schindelin
2018-06-19 16:21 ` Junio C Hamano
2018-06-20 11:04 ` Johannes Schindelin
2018-06-16 19:00 ` [PATCH 2/2] rebase --root: fix amending root commit messages Johannes Schindelin via GitGitGadget
2018-06-16 20:11 ` [PATCH 0/2] rebase --root: fix `reword` on a root commit Todd Zullinger
2018-06-18 16:21 ` Junio C Hamano
2018-06-18 16:41 ` Todd Zullinger
2018-06-18 19:25 ` Junio C Hamano
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=d59805a43ddaf4bbd4528a2b7afa9809eca9b86b.1529177176.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=tmz@pobox.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).