Re: [PATCH] t3404: check root commit in 'rebase -i --root reword root commit'
From: Junio C Hamano <hidden>
Date: 2018-06-19 16:00:08
Todd Zullinger [off-list ref] writes:
With luck, this will save you a few minutes, assuming the commit message is reasonable (or can be improved with help from Phillip and others). :)
OK.
Or Junio may just squash this onto js/rebase-i-root-fix.
Nah, not for a hotfix on the last couple of days before the final. We'd need to build on top, not "squash".
quoted hunk
Thanks. t/t3404-rebase-interactive.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index e500d7c320..352a52e59d 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh@@ -977,7 +977,8 @@ test_expect_success 'rebase -i --root reword root commit' ' set_fake_editor && FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \ git rebase -i --root && - git show HEAD^ | grep "A changed" + git show HEAD^ | grep "A changed" && + test -z "$(git show -s --format=%p HEAD^)" ' test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-interactive rebase' '