diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-02 02:04:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 02:04:59 (GMT) |
| commit | 85fcf1cbb6eb2e8fb1512a5ffe834b6a07deb4cd (patch) | |
| tree | f88809b7b7bf00832305a28ac1a76044e26f1ba1 /t | |
| parent | 789b1f70422d5c9ffb3a0ecb11284aa0ac13985e (diff) | |
| parent | 3a4a4cab3ef024e10af7a5bbcaed4b961c60f1db (diff) | |
| download | git-85fcf1cbb6eb2e8fb1512a5ffe834b6a07deb4cd.zip git-85fcf1cbb6eb2e8fb1512a5ffe834b6a07deb4cd.tar.gz git-85fcf1cbb6eb2e8fb1512a5ffe834b6a07deb4cd.tar.bz2 | |
Merge branch 'js/rebase-i-shortopt'
"git rebase -i" learned to take 'b' as the short form of 'break'
option in the todo list.
* js/rebase-i-shortopt:
rebase -i: recognize short commands without arguments
Diffstat (limited to 't')
| -rw-r--r-- | t/lib-rebase.sh | 2 | ||||
| -rwxr-xr-x | t/t3418-rebase-continue.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 241f64b..f6c45ee 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -49,7 +49,7 @@ set_fake_editor () { case $line in pick|squash|fixup|edit|reword|drop) action="$line";; - exec*|break) + exec*|break|b) echo "$line" | sed 's/_/ /g' >> "$1";; "#") echo '# comment' >> "$1";; diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 75cd2d8..4c3f7d8 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -245,7 +245,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 |