diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-29 22:38:18 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 22:38:18 +0300 |
| commit | 8eb5097bea042205810781d786a8eb7abd2962a9 (patch) | |
| tree | 15b8115a7c9b0ccd2b7a3b3495bfa13c27647c75 /t | |
| parent | 1cf76b701050aeb695362df9e704d69636579191 (diff) | |
| parent | 906b63942ac7f0ff904228b03d5dbe1edc59f0fe (diff) | |
Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maint
The configuration variable rebase.rescheduleFailedExec should be
effective only while running an interactive rebase and should not
affect anything when running an non-interactive one, which was not
the case. This has been corrected.
* js/rebase-reschedule-applies-only-to-interactive:
rebase --am: ignore rebase.rescheduleFailedExec
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3418-rebase-continue.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index bdaa511bb0..4eff14dae5 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -265,4 +265,12 @@ test_expect_success '--reschedule-failed-exec' ' test_i18ngrep "has been rescheduled" err ' +test_expect_success 'rebase.reschedulefailedexec only affects `rebase -i`' ' + test_config rebase.reschedulefailedexec true && + test_must_fail git rebase -x false HEAD^ && + grep "^exec false" .git/rebase-merge/git-rebase-todo && + git rebase --abort && + git rebase HEAD^ +' + test_done |