diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-12-10 11:04:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-11 17:19:01 +0900 |
| commit | d421afa0c66ec6bbd15602d534f77546c516f2a5 (patch) | |
| tree | 723714ec4901aeb6facf61094e98d3728631c80f /builtin/rebase--interactive.c | |
| parent | 5d826e972970a784bd7a7bdf587512510097b8c7 (diff) | |
| download | git-d421afa0c66ec6bbd15602d534f77546c516f2a5.tar.xz | |
rebase: introduce --reschedule-failed-exec
A common use case for the `--exec` option is to verify that each commit
in a topic branch compiles cleanly, via `git rebase -x make <base>`.
However, when an `exec` in such a rebase fails, it is not re-scheduled,
which in this instance is not particularly helpful.
Let's offer a flag to reschedule failed `exec` commands.
Based on an idea by Paul Morelle.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rebase--interactive.c')
| -rw-r--r-- | builtin/rebase--interactive.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c index a2ab68ed06..a9ab009fdb 100644 --- a/builtin/rebase--interactive.c +++ b/builtin/rebase--interactive.c @@ -192,6 +192,8 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) OPT_STRING(0, "onto-name", &onto_name, N_("onto-name"), N_("onto name")), OPT_STRING(0, "cmd", &cmd, N_("cmd"), N_("the command to run")), OPT_RERERE_AUTOUPDATE(&opts.allow_rerere_auto), + OPT_BOOL(0, "reschedule-failed-exec", &opts.reschedule_failed_exec, + N_("automatically re-schedule any `exec` that fails")), OPT_END() }; |