mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
21d0764c82
commit
3a36ca0881
|
@ -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 &&
|
||||
|
|
Loading…
Reference in a new issue