diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-30 22:45:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-30 22:45:21 +0200 |
| commit | 545222471004cc3fd53c54ff53d40a8bbc3dabe6 (patch) | |
| tree | 69541daf226f975eaf8adeb42482da541b7c33c8 /t/t3404-rebase-interactive.sh | |
| parent | Twelfth batch for 2.14 (diff) | |
| parent | t3420: fix under GETTEXT_POISON build (diff) | |
| download | git-545222471004cc3fd53c54ff53d40a8bbc3dabe6.tar.xz git-545222471004cc3fd53c54ff53d40a8bbc3dabe6.zip | |
Merge branch 'pw/rebase-i-regression-fix-tests'
Fix a recent regression to "git rebase -i" and add tests that would
have caught it and others.
* pw/rebase-i-regression-fix-tests:
t3420: fix under GETTEXT_POISON build
rebase: add more regression tests for console output
rebase: add regression tests for console output
rebase -i: add test for reflog message
sequencer: print autostash messages to stderr
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 5bd0275930..37821d2454 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -169,6 +169,13 @@ test_expect_success 'reflog for the branch shows state before rebase' ' test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1) ' +test_expect_success 'reflog for the branch shows correct finish message' ' + printf "rebase -i (finish): refs/heads/branch1 onto %s\n" \ + "$(git rev-parse branch2)" >expected && + git log -g --pretty=%gs -1 refs/heads/branch1 >actual && + test_cmp expected actual +' + test_expect_success 'exchange two commits' ' set_fake_editor && FAKE_LINES="2 1" git rebase -i HEAD~2 && |