diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-12-10 22:04:59 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-11 11:19:01 +0300 |
| commit | 969de3ff0e01282cc061892f47b5f04b22de76af (patch) | |
| tree | 7cb57f640d3a3dfa681969c0d837607623dd7232 /t/t3418-rebase-continue.sh | |
| parent | d421afa0c66ec6bbd15602d534f77546c516f2a5 (diff) | |
rebase: add a config option to default to --reschedule-failed-exec
It would be cumbersome to type out that option all the time, so let's
offer the convenience of a config setting: rebase.rescheduleFailedExec.
Besides, this opens the door to changing the default in a future version
of Git: it does make some sense to reschedule failed `exec` commands by
default (and if we could go back in time when the `exec` command was
invented, we probably would change that default right from the start).
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 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 54b26a9284..bdaa511bb0 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -257,7 +257,12 @@ test_expect_success 'the todo command "break" works' ' test_expect_success '--reschedule-failed-exec' ' test_when_finished "git rebase --abort" && test_must_fail git rebase -x false --reschedule-failed-exec HEAD^ && - grep "^exec false" .git/rebase-merge/git-rebase-todo + grep "^exec false" .git/rebase-merge/git-rebase-todo && + git rebase --abort && + 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 ' test_done |