diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-12-10 22:04:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-11 11:19:01 +0300 |
| commit | d421afa0c66ec6bbd15602d534f77546c516f2a5 (patch) | |
| tree | 723714ec4901aeb6facf61094e98d3728631c80f /git-rebase--common.sh | |
| parent | 5d826e972970a784bd7a7bdf587512510097b8c7 (diff) | |
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 'git-rebase--common.sh')
| -rw-r--r-- | git-rebase--common.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-rebase--common.sh b/git-rebase--common.sh index 7e39d22871..a8a44608e0 100644 --- a/git-rebase--common.sh +++ b/git-rebase--common.sh @@ -19,6 +19,7 @@ write_basic_state () { "$state_dir"/allow_rerere_autoupdate test -n "$gpg_sign_opt" && echo "$gpg_sign_opt" > "$state_dir"/gpg_sign_opt test -n "$signoff" && echo "$signoff" >"$state_dir"/signoff + test -n "$reschedule_failed_exec" && : > "$state_dir"/reschedule-failed-exec } apply_autostash () { |