Re: [PATCH 1/2] rebase --root: demonstrate a bug while amending rootcommit messages
- From
- Phillip Wood <phillip.wood@talktalk.net>
- Date
- Jun 18, 2018, 10:25 UTC
- Message-ID
- <484fe825-0726-a027-1187-de00df6406d5@talktalk.net>
- In-Reply-To
- <d59805a43ddaf4bbd4528a2b7afa9809eca9b86b.1529177176.git.gitgitgadget@gmail.com>
Hi Todd/Johannes
On 15/06/18 05:31, Johannes Schindelin via GitGitGadget wrote:
Show 29 quoted lines
> > 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"
I wonder if it should also check that HEAD^ is the root commit, to make sure that the squash-onto commit that's created and then amended has been squashed onto.
Best Wishes
Phillip
Show 6 quoted lines
> +' > + > test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-interactive rebase' ' > git reset --hard && > git checkout conflict-branch && >