diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-12-10 11:05:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-11 17:19:01 +0900 |
| commit | 81ef8ee75d5f348d3c71ff633d13d302124e1a5e (patch) | |
| tree | dfe951e0a92f21fc4d9bbe32c919f09742af392d /t/t3418-rebase-continue.sh | |
| parent | rebase: add a config option to default to --reschedule-failed-exec (diff) | |
| download | git-81ef8ee75d5f348d3c71ff633d13d302124e1a5e.tar.gz git-81ef8ee75d5f348d3c71ff633d13d302124e1a5e.zip | |
rebase: introduce a shortcut for --reschedule-failed-exec
It is a bit cumbersome to write out the `--reschedule-failed-exec`
option before `-x <cmd>` all the time; let's introduce a convenient
option to do both at the same time: `-y <cmd>`.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3418-rebase-continue.sh')
| -rwxr-xr-x | t/t3418-rebase-continue.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index bdaa511bb0..25aaacacfc 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -262,6 +262,9 @@ test_expect_success '--reschedule-failed-exec' ' test_must_fail git -c rebase.rescheduleFailedExec=true \ rebase -x false HEAD^ 2>err && grep "^exec false" .git/rebase-merge/git-rebase-todo && + test_i18ngrep "has been rescheduled" err && + git rebase --abort && + test_must_fail git rebase -y false HEAD^ 2>err && test_i18ngrep "has been rescheduled" err ' |