diff options
| author |   Todd Zullinger <tmz@pobox.com> | 2018-06-15 00:31:11 -0400 |
|---|---|---|
| committer |   Junio C Hamano <gitster@pobox.com> | 2018-06-18 09:22:18 -0700 |
| commit | 3a36ca08818c0ca858de56ad49857b97a509ef2a (patch) | |
| tree | 554c3bd3c56b7df1ed05d2b98935c26c7fa426d9 | |
| parent | rebase -i --root: let the sequencer handle even the initial part (diff) | |
| download | git-3a36ca08818c0ca858de56ad49857b97a509ef2a.tar.xz git-3a36ca08818c0ca858de56ad49857b97a509ef2a.zip | |
rebase --root: demonstrate a bug while amending root commit messages
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>
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index c65826ddace..ca94c688d23 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 && |