diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2018-10-25 22:47:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-26 03:20:23 +0200 |
| commit | 3a4a4cab3ef024e10af7a5bbcaed4b961c60f1db (patch) | |
| tree | 845fa7bba14ed40fbc833f3f7a999a684ffd1557 /t/t3418-rebase-continue.sh | |
| parent | rebase -i: introduce the 'break' command (diff) | |
| download | git-3a4a4cab3ef024e10af7a5bbcaed4b961c60f1db.tar.xz git-3a4a4cab3ef024e10af7a5bbcaed4b961c60f1db.zip | |
rebase -i: recognize short commands without arguments
The sequencer instruction 'b', short for 'break', is rejected:
error: invalid line 2: b
The reason is that the parser expects all short commands to have
an argument. Permit short commands without arguments.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rwxr-xr-x | t/t3418-rebase-continue.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 185a491089..b282505aac 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -243,7 +243,9 @@ unset GIT_SEQUENCE_EDITOR test_expect_success 'the todo command "break" works' ' rm -f execed && - FAKE_LINES="break exec_>execed" git rebase -i HEAD && + FAKE_LINES="break b exec_>execed" git rebase -i HEAD && + test_path_is_missing execed && + git rebase --continue && test_path_is_missing execed && git rebase --continue && test_path_is_file execed |