mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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>
This commit is contained in:
parent
5d826e9729
commit
d421afa0c6
|
@ -501,6 +501,11 @@ See also INCOMPATIBLE OPTIONS below.
|
||||||
with care: the final stash application after a successful
|
with care: the final stash application after a successful
|
||||||
rebase might result in non-trivial conflicts.
|
rebase might result in non-trivial conflicts.
|
||||||
|
|
||||||
|
--reschedule-failed-exec::
|
||||||
|
--no-reschedule-failed-exec::
|
||||||
|
Automatically reschedule `exec` commands that failed. This only makes
|
||||||
|
sense in interactive mode (or when an `--exec` option was provided).
|
||||||
|
|
||||||
INCOMPATIBLE OPTIONS
|
INCOMPATIBLE OPTIONS
|
||||||
--------------------
|
--------------------
|
||||||
|
|
||||||
|
|
|
@ -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, "onto-name", &onto_name, N_("onto-name"), N_("onto name")),
|
||||||
OPT_STRING(0, "cmd", &cmd, N_("cmd"), N_("the command to run")),
|
OPT_STRING(0, "cmd", &cmd, N_("cmd"), N_("the command to run")),
|
||||||
OPT_RERERE_AUTOUPDATE(&opts.allow_rerere_auto),
|
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()
|
OPT_END()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -104,6 +104,7 @@ struct rebase_options {
|
||||||
int rebase_merges, rebase_cousins;
|
int rebase_merges, rebase_cousins;
|
||||||
char *strategy, *strategy_opts;
|
char *strategy, *strategy_opts;
|
||||||
struct strbuf git_format_patch_opt;
|
struct strbuf git_format_patch_opt;
|
||||||
|
int reschedule_failed_exec;
|
||||||
};
|
};
|
||||||
|
|
||||||
static int is_interactive(struct rebase_options *opts)
|
static int is_interactive(struct rebase_options *opts)
|
||||||
|
@ -415,6 +416,8 @@ static int run_specific_rebase(struct rebase_options *opts)
|
||||||
argv_array_push(&child.args, opts->gpg_sign_opt);
|
argv_array_push(&child.args, opts->gpg_sign_opt);
|
||||||
if (opts->signoff)
|
if (opts->signoff)
|
||||||
argv_array_push(&child.args, "--signoff");
|
argv_array_push(&child.args, "--signoff");
|
||||||
|
if (opts->reschedule_failed_exec)
|
||||||
|
argv_array_push(&child.args, "--reschedule-failed-exec");
|
||||||
|
|
||||||
status = run_command(&child);
|
status = run_command(&child);
|
||||||
goto finished_rebase;
|
goto finished_rebase;
|
||||||
|
@ -920,6 +923,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||||
"strategy")),
|
"strategy")),
|
||||||
OPT_BOOL(0, "root", &options.root,
|
OPT_BOOL(0, "root", &options.root,
|
||||||
N_("rebase all reachable commits up to the root(s)")),
|
N_("rebase all reachable commits up to the root(s)")),
|
||||||
|
OPT_BOOL(0, "reschedule-failed-exec",
|
||||||
|
&options.reschedule_failed_exec,
|
||||||
|
N_("automatically re-schedule any `exec` that fails")),
|
||||||
OPT_END(),
|
OPT_END(),
|
||||||
};
|
};
|
||||||
int i;
|
int i;
|
||||||
|
@ -1216,6 +1222,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (options.reschedule_failed_exec && !is_interactive(&options))
|
||||||
|
die(_("--reschedule-failed-exec requires an interactive rebase"));
|
||||||
|
|
||||||
if (options.git_am_opts.argc) {
|
if (options.git_am_opts.argc) {
|
||||||
/* all am options except -q are compatible only with --am */
|
/* all am options except -q are compatible only with --am */
|
||||||
for (i = options.git_am_opts.argc - 1; i >= 0; i--)
|
for (i = options.git_am_opts.argc - 1; i >= 0; i--)
|
||||||
|
@ -1241,7 +1250,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||||
options.flags |= REBASE_FORCE;
|
options.flags |= REBASE_FORCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.type == REBASE_PRESERVE_MERGES)
|
if (options.type == REBASE_PRESERVE_MERGES) {
|
||||||
/*
|
/*
|
||||||
* Note: incompatibility with --signoff handled in signoff block above
|
* Note: incompatibility with --signoff handled in signoff block above
|
||||||
* Note: incompatibility with --interactive is just a strong warning;
|
* Note: incompatibility with --interactive is just a strong warning;
|
||||||
|
@ -1251,6 +1260,11 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||||
die(_("error: cannot combine '--preserve-merges' with "
|
die(_("error: cannot combine '--preserve-merges' with "
|
||||||
"'--rebase-merges'"));
|
"'--rebase-merges'"));
|
||||||
|
|
||||||
|
if (options.reschedule_failed_exec)
|
||||||
|
die(_("error: cannot combine '--preserve-merges' with "
|
||||||
|
"'--reschedule-failed-exec'"));
|
||||||
|
}
|
||||||
|
|
||||||
if (options.rebase_merges) {
|
if (options.rebase_merges) {
|
||||||
if (strategy_options.nr)
|
if (strategy_options.nr)
|
||||||
die(_("error: cannot combine '--rebase-merges' with "
|
die(_("error: cannot combine '--rebase-merges' with "
|
||||||
|
|
|
@ -48,6 +48,7 @@ skip! skip current patch and continue
|
||||||
edit-todo! edit the todo list during an interactive rebase
|
edit-todo! edit the todo list during an interactive rebase
|
||||||
quit! abort but keep HEAD where it is
|
quit! abort but keep HEAD where it is
|
||||||
show-current-patch! show the patch file being applied or merged
|
show-current-patch! show the patch file being applied or merged
|
||||||
|
reschedule-failed-exec automatically reschedule failed exec commands
|
||||||
"
|
"
|
||||||
. git-sh-setup
|
. git-sh-setup
|
||||||
set_reflog_action rebase
|
set_reflog_action rebase
|
||||||
|
@ -92,6 +93,7 @@ autosquash=
|
||||||
keep_empty=
|
keep_empty=
|
||||||
allow_empty_message=--allow-empty-message
|
allow_empty_message=--allow-empty-message
|
||||||
signoff=
|
signoff=
|
||||||
|
reschedule_failed_exec=
|
||||||
test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t
|
test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t
|
||||||
case "$(git config --bool commit.gpgsign)" in
|
case "$(git config --bool commit.gpgsign)" in
|
||||||
true) gpg_sign_opt=-S ;;
|
true) gpg_sign_opt=-S ;;
|
||||||
|
@ -126,6 +128,8 @@ read_basic_state () {
|
||||||
signoff="$(cat "$state_dir"/signoff)"
|
signoff="$(cat "$state_dir"/signoff)"
|
||||||
force_rebase=t
|
force_rebase=t
|
||||||
}
|
}
|
||||||
|
test -f "$state_dir"/reschedule-failed-exec &&
|
||||||
|
reschedule_failed_exec=t
|
||||||
}
|
}
|
||||||
|
|
||||||
finish_rebase () {
|
finish_rebase () {
|
||||||
|
@ -163,7 +167,8 @@ run_interactive () {
|
||||||
"$allow_empty_message" "$autosquash" "$verbose" \
|
"$allow_empty_message" "$autosquash" "$verbose" \
|
||||||
"$force_rebase" "$onto_name" "$head_name" "$strategy" \
|
"$force_rebase" "$onto_name" "$head_name" "$strategy" \
|
||||||
"$strategy_opts" "$cmd" "$switch_to" \
|
"$strategy_opts" "$cmd" "$switch_to" \
|
||||||
"$allow_rerere_autoupdate" "$gpg_sign_opt" "$signoff"
|
"$allow_rerere_autoupdate" "$gpg_sign_opt" "$signoff" \
|
||||||
|
"$reschedule_failed_exec"
|
||||||
}
|
}
|
||||||
|
|
||||||
run_specific_rebase () {
|
run_specific_rebase () {
|
||||||
|
@ -378,6 +383,12 @@ do
|
||||||
--gpg-sign=*)
|
--gpg-sign=*)
|
||||||
gpg_sign_opt="-S${1#--gpg-sign=}"
|
gpg_sign_opt="-S${1#--gpg-sign=}"
|
||||||
;;
|
;;
|
||||||
|
--reschedule-failed-exec)
|
||||||
|
reschedule_failed_exec=--reschedule-failed-exec
|
||||||
|
;;
|
||||||
|
--no-reschedule-failed-exec)
|
||||||
|
reschedule_failed_exec=
|
||||||
|
;;
|
||||||
--)
|
--)
|
||||||
shift
|
shift
|
||||||
break
|
break
|
||||||
|
@ -534,6 +545,9 @@ then
|
||||||
# git-rebase.txt caveats with "unless you know what you are doing"
|
# git-rebase.txt caveats with "unless you know what you are doing"
|
||||||
test -n "$rebase_merges" &&
|
test -n "$rebase_merges" &&
|
||||||
die "$(gettext "error: cannot combine '--preserve-merges' with '--rebase-merges'")"
|
die "$(gettext "error: cannot combine '--preserve-merges' with '--rebase-merges'")"
|
||||||
|
|
||||||
|
test -n "$reschedule_failed_exec" &&
|
||||||
|
die "$(gettext "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'")"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -n "$rebase_merges"
|
if test -n "$rebase_merges"
|
||||||
|
|
|
@ -19,6 +19,7 @@ write_basic_state () {
|
||||||
"$state_dir"/allow_rerere_autoupdate
|
"$state_dir"/allow_rerere_autoupdate
|
||||||
test -n "$gpg_sign_opt" && echo "$gpg_sign_opt" > "$state_dir"/gpg_sign_opt
|
test -n "$gpg_sign_opt" && echo "$gpg_sign_opt" > "$state_dir"/gpg_sign_opt
|
||||||
test -n "$signoff" && echo "$signoff" >"$state_dir"/signoff
|
test -n "$signoff" && echo "$signoff" >"$state_dir"/signoff
|
||||||
|
test -n "$reschedule_failed_exec" && : > "$state_dir"/reschedule-failed-exec
|
||||||
}
|
}
|
||||||
|
|
||||||
apply_autostash () {
|
apply_autostash () {
|
||||||
|
|
13
sequencer.c
13
sequencer.c
|
@ -158,6 +158,7 @@ static GIT_PATH_FUNC(rebase_path_strategy, "rebase-merge/strategy")
|
||||||
static GIT_PATH_FUNC(rebase_path_strategy_opts, "rebase-merge/strategy_opts")
|
static GIT_PATH_FUNC(rebase_path_strategy_opts, "rebase-merge/strategy_opts")
|
||||||
static GIT_PATH_FUNC(rebase_path_allow_rerere_autoupdate, "rebase-merge/allow_rerere_autoupdate")
|
static GIT_PATH_FUNC(rebase_path_allow_rerere_autoupdate, "rebase-merge/allow_rerere_autoupdate")
|
||||||
static GIT_PATH_FUNC(rebase_path_quiet, "rebase-merge/quiet")
|
static GIT_PATH_FUNC(rebase_path_quiet, "rebase-merge/quiet")
|
||||||
|
static GIT_PATH_FUNC(rebase_path_reschedule_failed_exec, "rebase-merge/reschedule-failed-exec")
|
||||||
|
|
||||||
static int git_sequencer_config(const char *k, const char *v, void *cb)
|
static int git_sequencer_config(const char *k, const char *v, void *cb)
|
||||||
{
|
{
|
||||||
|
@ -2362,6 +2363,9 @@ static int read_populate_opts(struct replay_opts *opts)
|
||||||
opts->signoff = 1;
|
opts->signoff = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (file_exists(rebase_path_reschedule_failed_exec()))
|
||||||
|
opts->reschedule_failed_exec = 1;
|
||||||
|
|
||||||
read_strategy_opts(opts, &buf);
|
read_strategy_opts(opts, &buf);
|
||||||
strbuf_release(&buf);
|
strbuf_release(&buf);
|
||||||
|
|
||||||
|
@ -2443,6 +2447,8 @@ int write_basic_state(struct replay_opts *opts, const char *head_name,
|
||||||
write_file(rebase_path_gpg_sign_opt(), "-S%s\n", opts->gpg_sign);
|
write_file(rebase_path_gpg_sign_opt(), "-S%s\n", opts->gpg_sign);
|
||||||
if (opts->signoff)
|
if (opts->signoff)
|
||||||
write_file(rebase_path_signoff(), "--signoff\n");
|
write_file(rebase_path_signoff(), "--signoff\n");
|
||||||
|
if (opts->reschedule_failed_exec)
|
||||||
|
write_file(rebase_path_reschedule_failed_exec(), "%s", "");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -3586,9 +3592,10 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
|
||||||
*end_of_arg = saved;
|
*end_of_arg = saved;
|
||||||
|
|
||||||
/* Reread the todo file if it has changed. */
|
/* Reread the todo file if it has changed. */
|
||||||
if (res)
|
if (res) {
|
||||||
; /* fall through */
|
if (opts->reschedule_failed_exec)
|
||||||
else if (stat(get_todo_path(opts), &st))
|
reschedule = 1;
|
||||||
|
} else if (stat(get_todo_path(opts), &st))
|
||||||
res = error_errno(_("could not stat '%s'"),
|
res = error_errno(_("could not stat '%s'"),
|
||||||
get_todo_path(opts));
|
get_todo_path(opts));
|
||||||
else if (match_stat_data(&todo_list->stat, &st)) {
|
else if (match_stat_data(&todo_list->stat, &st)) {
|
||||||
|
|
|
@ -39,6 +39,7 @@ struct replay_opts {
|
||||||
int allow_empty_message;
|
int allow_empty_message;
|
||||||
int keep_redundant_commits;
|
int keep_redundant_commits;
|
||||||
int verbose;
|
int verbose;
|
||||||
|
int reschedule_failed_exec;
|
||||||
|
|
||||||
int mainline;
|
int mainline;
|
||||||
|
|
||||||
|
|
|
@ -254,4 +254,10 @@ test_expect_success 'the todo command "break" works' '
|
||||||
test_path_is_file execed
|
test_path_is_file execed
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success '--reschedule-failed-exec' '
|
||||||
|
test_when_finished "git rebase --abort" &&
|
||||||
|
test_must_fail git rebase -x false --reschedule-failed-exec HEAD^ &&
|
||||||
|
grep "^exec false" .git/rebase-merge/git-rebase-todo
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue