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

gitster · gitster · commit 6b55779afc4e · 2018-06-19T09:26:28.000-07:00
* 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
@@ -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' '

Original file line number	Diff line number	Diff line change
`@@ -977,7 +977,8 @@ test_expect_success 'rebase -i --root reword root commit' '`
`977`	`977`	`set_fake_editor &&`
`978`	`978`	`FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \`
`979`	`979`	`git rebase -i --root &&`
`980`		`- git show HEAD^ \| grep "A changed"`
	`980`	`+ git show HEAD^ \| grep "A changed" &&`
	`981`	`+ test -z "$(git show -s --format=%p HEAD^)"`
`981`	`982`	`'`
`982`	`983`
`983`	`984`	`test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-interactive rebase' '`