diff options
| author | Todd Zullinger <tmz@pobox.com> | 2018-06-18 22:19:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-19 16:14:33 (GMT) |
| commit | 878810552b42a444b2a38ccaad60d23969638f05 (patch) | |
| tree | 75089e930d48291ba220c675bcf3a9ccbfe08bf0 | |
| parent | 76fda6ebbc721e39ed70625206ba1dab5a9c1340 (diff) | |
| download | git-878810552b42a444b2a38ccaad60d23969638f05.zip git-878810552b42a444b2a38ccaad60d23969638f05.tar.gz git-878810552b42a444b2a38ccaad60d23969638f05.tar.bz2 | |
t3404: check root commit in 'rebase -i --root reword root commit'
When testing a reworded root commit, ensure that the squash-onto commit
which is created and amended is still the root commit.
Suggested-by: Phillip Wood <phillip.wood@talktalk.net>
Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 3 |
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' ' |