summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-19 16:26:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-19 16:26:28 (GMT)
commit6b55779afc4e211ff051c5129481a5f2a08ef306 (patch)
treec519a356d97e9382334c1758ffa9accf738b7078
parent1f2abe68d032c72d450c5afd1271953596e6258f (diff)
parent878810552b42a444b2a38ccaad60d23969638f05 (diff)
downloadgit-6b55779afc4e211ff051c5129481a5f2a08ef306.zip
git-6b55779afc4e211ff051c5129481a5f2a08ef306.tar.gz
git-6b55779afc4e211ff051c5129481a5f2a08ef306.tar.bz2
Merge branch 'js/rebase-i-root-fix'
* js/rebase-i-root-fix: t3404: check root commit in 'rebase -i --root reword root commit'
-rwxr-xr-xt/t3404-rebase-interactive.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index e500d7c..352a52e 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' '