diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-12 01:16:48 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-12 01:16:48 +0300 |
| commit | 64096fb41d36cf0e9808c9d15ae46ec364e5c800 (patch) | |
| tree | 51a033877cfd78934642963ad968328580798813 | |
| parent | df73cb38d942d2fb305a0fbfedd9a093ca386c83 (diff) | |
| parent | 906b63942ac7f0ff904228b03d5dbe1edc59f0fe (diff) | |
Merge branch 'js/rebase-reschedule-applies-only-to-interactive'
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
| -rw-r--r-- | builtin/rebase.c | 10 | ||||
| -rwxr-xr-x | t/t3418-rebase-continue.sh | 8 |
2 files changed, 15 insertions, 3 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 3c7d8b894a..89fc4b8153 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1389,6 +1389,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) struct string_list strategy_options = STRING_LIST_INIT_NODUP; struct object_id squash_onto; char *squash_onto_name = NULL; + int reschedule_failed_exec = -1; struct option builtin_rebase_options[] = { OPT_STRING(0, "onto", &options.onto_name, N_("revision"), @@ -1481,7 +1482,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "root", &options.root, N_("rebase all reachable commits up to the root(s)")), OPT_BOOL(0, "reschedule-failed-exec", - &options.reschedule_failed_exec, + &reschedule_failed_exec, N_("automatically re-schedule any `exec` that fails")), OPT_END(), }; @@ -1796,8 +1797,11 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) break; } - if (options.reschedule_failed_exec && !is_interactive(&options)) - die(_("%s requires an interactive rebase"), "--reschedule-failed-exec"); + if (reschedule_failed_exec > 0 && !is_interactive(&options)) + die(_("--reschedule-failed-exec requires " + "--exec or --interactive")); + if (reschedule_failed_exec >= 0) + options.reschedule_failed_exec = reschedule_failed_exec; if (options.git_am_opts.argc) { /* all am options except -q are compatible only with --am */ 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 |