diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-29 19:38:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 19:38:20 (GMT) |
| commit | 649cae69bc8cc99fd5a9e72f8a08ae301d0d5e16 (patch) | |
| tree | dacfd5d2a4738af3ffffd3215f9cb2fd090336e7 /t | |
| parent | 39521d07bedc4a8f1f8891ff1bc0a5b34213504f (diff) | |
| parent | d559f502c59658ea1f360fd28d8909894e40a4fe (diff) | |
| download | git-649cae69bc8cc99fd5a9e72f8a08ae301d0d5e16.zip git-649cae69bc8cc99fd5a9e72f8a08ae301d0d5e16.tar.gz git-649cae69bc8cc99fd5a9e72f8a08ae301d0d5e16.tar.bz2 | |
Merge branch 'pw/rebase-abort-clean-rewritten' into maint
"git rebase --abort" used to leave refs/rewritten/ when concluding
"git rebase -r", which has been corrected.
* pw/rebase-abort-clean-rewritten:
rebase --abort/--quit: cleanup refs/rewritten
sequencer: return errors from sequencer_remove_state()
rebase: warn if state directory cannot be removed
rebase: fix a memory leak
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3430-rebase-merges.sh | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index 42ba5b9..f0814d5 100755 --- a/t/t3430-rebase-merges.sh +++ b/t/t3430-rebase-merges.sh @@ -224,8 +224,24 @@ test_expect_success 'refs/rewritten/* is worktree-local' ' test_cmp_rev HEAD "$(cat wt/b)" ' +test_expect_success '--abort cleans up refs/rewritten' ' + git checkout -b abort-cleans-refs-rewritten H && + GIT_SEQUENCE_EDITOR="echo break >>" git rebase -ir @^ && + git rev-parse --verify refs/rewritten/onto && + git rebase --abort && + test_must_fail git rev-parse --verify refs/rewritten/onto +' + +test_expect_success '--quit cleans up refs/rewritten' ' + git checkout -b quit-cleans-refs-rewritten H && + GIT_SEQUENCE_EDITOR="echo break >>" git rebase -ir @^ && + git rev-parse --verify refs/rewritten/onto && + git rebase --quit && + test_must_fail git rev-parse --verify refs/rewritten/onto +' + test_expect_success 'post-rewrite hook and fixups work for merges' ' - git checkout -b post-rewrite && + git checkout -b post-rewrite H && test_commit same1 && git reset --hard HEAD^ && test_commit same2 && |