Skip to content

rebase: offer to reschedule failed exec commands automatically

Johannes Schindelin via GitGitGadget git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 11 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3rebase: introduce --reschedule-failed-execDocumentation/git-rebase.txt builtin/rebase--interactive.c builtin/rebase.c +5 more+55 -53 replies
2/3rebase: add a config option to default to --reschedule-failed-execDocumentation/config/rebase.txt builtin/rebase.c git-legacy-rebase.sh +1 more+18 -114 replies
3/3rebase: introduce a shortcut for --reschedule-failed-execDocumentation/git-rebase.txt builtin/rebase.c git-legacy-rebase.sh +1 more+36 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/3] rebase: offer to reschedule failed exec commands automatically

The idea was brought up by Paul Morelle.

To be honest, this idea of rescheduling a failed exec makes so much sense that I wish we had done this from the get-go.

So let's do the next best thing: implement a command-line option and a config setting to make it so.

The obvious intent behind that config setting is to not only give users a way to opt into that behavior already, but also to make it possible to flip the default at a later date, after the feature has been battle-tested and after deprecating the non-rescheduling behavior for a couple of Git versions.

If the team agrees with my reasoning, then the 3rd patch (introducing -y <cmd> as a shortcut for --reschedule-failed-exec -x <cmd>) might not make much sense, as it would introduce a short option that would become obsolete soon.

Johannes Schindelin (3):
rebase: introduce --reschedule-failed-exec
rebase: add a config option to default to --reschedule-failed-exec
rebase: introduce a shortcut for --reschedule-failed-exec

 Documentation/config/rebase.txt |  5 ++++
 Documentation/git-rebase.txt    | 11 +++++++++
 builtin/rebase--interactive.c   |  2 ++
 builtin/rebase.c                | 42 ++++++++++++++++++++++++++++++++-
 git-legacy-rebase.sh            | 24 ++++++++++++++++++-
 git-rebase--common.sh           |  1 +
 sequencer.c                     | 13 +++++++---
 sequencer.h                     |  1 +
 t/t3418-rebase-continue.sh      | 14 +++++++++++
 9 files changed, 108 insertions(+), 5 deletions(-)

base-commit: a1598010f775d82b5adf12c29d0f5bc9b41434c6
Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-90%2Fdscho%2Freschedule-failed-exec-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-90/dscho/reschedule-failed-exec-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/90

Signature · 1 line
gitgitgadget