diff options
| author |  Alban Gruin <alban.gruin@gmail.com> | 2018-08-10 18:51:37 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-08-10 11:56:22 -0700 |
| commit | d078c39106895b26512ca6b259d66fe64b274e1b (patch) | |
| tree | 0d2279352e372738da5be4ef3680616987b075a6 /t | |
| parent | sequencer: change the way skip_unnecessary_picks() returns its result (diff) | |
| download | tgif-d078c39106895b26512ca6b259d66fe64b274e1b.tar.xz | |
t3404: todo list with commented-out commands only aborts
If the todo list generated by `--make-script` is empty,
complete_action() writes a noop, but if it has only commented-out
commands, it will abort with the message "Nothing to do", and does not
launch the editor. This adds a new test to ensure that
complete_action() behaves this way.
Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index d392160ba9..7755b68092 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -75,6 +75,16 @@ test_expect_success 'rebase --keep-empty' ' test_line_count = 6 actual ' +cat > expect <<EOF +Nothing to do +EOF + +test_expect_success 'rebase -i with empty HEAD' ' + set_fake_editor && + test_must_fail env FAKE_LINES="1 exec_true" git rebase -i HEAD^ >actual 2>&1 && + test_i18ncmp expect actual +' + test_expect_success 'rebase -i with the exec command' ' git checkout master && ( |