]> git.ipfire.org Git - thirdparty/git.git/commitdiff
rebase --root: demonstrate a bug while amending root commit messages
authorTodd Zullinger <tmz@pobox.com>
Fri, 15 Jun 2018 04:31:11 +0000 (00:31 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 16:22:18 +0000 (09:22 -0700)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3404-rebase-interactive.sh

index c65826ddaced2f4bafeea0e4570ef9018218692c..ca94c688d235064cf1bd50b5cf1b7c760804d9d8 100755 (executable)
@@ -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 &&