diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-02 03:04:58 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 03:04:58 +0100 |
| commit | 789b1f70422d5c9ffb3a0ecb11284aa0ac13985e (patch) | |
| tree | 23d8b90cefd141b667962c4fcdf70968c91eeb42 /t/t3418-rebase-continue.sh | |
| parent | Merge branch 'js/rebase-autostash-fix' (diff) | |
| parent | rebase -i: introduce the 'break' command (diff) | |
| download | git-789b1f70422d5c9ffb3a0ecb11284aa0ac13985e.tar.xz git-789b1f70422d5c9ffb3a0ecb11284aa0ac13985e.zip | |
Merge branch 'js/rebase-i-break'
"git rebase -i" learned a new insn, 'break', that the user can
insert in the to-do list. Upon hitting it, the command returns
control back to the user.
* js/rebase-i-break:
rebase -i: introduce the 'break' command
rebase -i: clarify what happens on a failed `exec`
Diffstat (limited to 't/t3418-rebase-continue.sh')
| -rwxr-xr-x | t/t3418-rebase-continue.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 25099d715c..75cd2d80df 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -241,5 +241,14 @@ test_rerere_autoupdate -m GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR test_rerere_autoupdate -i test_rerere_autoupdate --preserve-merges +unset GIT_SEQUENCE_EDITOR + +test_expect_success 'the todo command "break" works' ' + rm -f execed && + FAKE_LINES="break exec_>execed" git rebase -i HEAD && + test_path_is_missing execed && + git rebase --continue && + test_path_is_file execed +' test_done |