From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Jun 2018 16:26:28 +0000 (-0700)
Subject: Merge branch 'js/rebase-i-root-fix'
X-Git-Tag: v2.18.0~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6b55779afc4e211ff051c5129481a5f2a08ef306?hp=1f2abe68d032c72d450c5afd1271953596e6258f

Merge branch 'js/rebase-i-root-fix'

* js/rebase-i-root-fix:
t3404: check root commit in 'rebase -i --root reword root commit'
---

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' '