Skip to content

Commit 3a36ca0

Browse files
tmzullingergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 21d0764 commit 3a36ca0

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

t/t3404-rebase-interactive.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -971,6 +971,15 @@ test_expect_success 'rebase -i --root fixup root commit' '
971971
test 0 = $(git cat-file commit HEAD | grep -c ^parent\ )
972972
'
973973

974+
test_expect_failure 'rebase -i --root reword root commit' '
975+
test_when_finished "test_might_fail git rebase --abort" &&
976+
git checkout -b reword-root-branch master &&
977+
set_fake_editor &&
978+
FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \
979+
git rebase -i --root &&
980+
git show HEAD^ | grep "A changed"
981+
'
982+
974983
test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-interactive rebase' '
975984
git reset --hard &&
976985
git checkout conflict-branch &&

0 commit comments

Comments
 (0)