diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-07 03:47:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-07 03:47:40 (GMT) |
| commit | 0377ac98dcf797d4711d2f0757ce49171ee4bb04 (patch) | |
| tree | eeac49d28b994b1b897fb54216022d4d400d4fcb /t | |
| parent | 5a357fa477bd9d7f9190cca3e5a7ef1186c3d64a (diff) | |
| parent | e5b32bffd1ddec64a1d1f593764d05841dd715e5 (diff) | |
| download | git-0377ac98dcf797d4711d2f0757ce49171ee4bb04.zip git-0377ac98dcf797d4711d2f0757ce49171ee4bb04.tar.gz git-0377ac98dcf797d4711d2f0757ce49171ee4bb04.tar.bz2 | |
Merge branch 'ab/rebase-no-reschedule-failed-exec'
"git rebase --[no-]reschedule-failed-exec" did not work well with
its configuration variable, which has been corrected.
* ab/rebase-no-reschedule-failed-exec:
rebase: don't override --no-reschedule-failed-exec with config
rebase tests: camel-case rebase.rescheduleFailedExec consistently
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3418-rebase-continue.sh | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 0838f4e..f4c2ee0 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -282,12 +282,35 @@ 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_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_expect_success 'rebase.rescheduleFailedExec=true & --no-reschedule-failed-exec' ' + test_when_finished "git rebase --abort" && + test_config rebase.rescheduleFailedExec true && + test_must_fail git rebase -x false --no-reschedule-failed-exec HEAD~2 && + test_must_fail git rebase --continue 2>err && + ! grep "has been rescheduled" err +' + +test_expect_success 'new rebase.rescheduleFailedExec=true setting in an ongoing rebase is ignored' ' + test_when_finished "git rebase --abort" && + test_must_fail git rebase -x false HEAD~2 && + test_config rebase.rescheduleFailedExec true && + test_must_fail git rebase --continue 2>err && + ! grep "has been rescheduled" err +' + +test_expect_success 'there is no --no-reschedule-failed-exec in an ongoing rebase' ' + test_when_finished "git rebase --abort" && + test_must_fail git rebase -x false HEAD~2 && + test_expect_code 129 git rebase --continue --no-reschedule-failed-exec && + test_expect_code 129 git rebase --edit-todo --no-reschedule-failed-exec +' + test_done |