mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
rebase: add a config option to default to --reschedule-failed-exec
It would be cumbersome to type out that option all the time, so let's offer the convenience of a config setting: rebase.rescheduleFailedExec. Besides, this opens the door to changing the default in a future version of Git: it does make some sense to reschedule failed `exec` commands by default (and if we could go back in time when the `exec` command was invented, we probably would change that default right from the start). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d421afa0c6
commit
969de3ff0e
|
@ -64,3 +64,8 @@ instead of:
|
||||||
-------------------------------------------
|
-------------------------------------------
|
||||||
+
|
+
|
||||||
Defaults to false.
|
Defaults to false.
|
||||||
|
|
||||||
|
rebase.rescheduleFailedExec::
|
||||||
|
Automatically reschedule `exec` commands that failed. This only makes
|
||||||
|
sense in interactive mode (or when an `--exec` option was provided).
|
||||||
|
This is the same as specifying the `--reschedule-failed-exec` option.
|
||||||
|
|
|
@ -677,6 +677,11 @@ static int rebase_config(const char *var, const char *value, void *data)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!strcmp(var, "rebase.reschedulefailedexec")) {
|
||||||
|
opts->reschedule_failed_exec = git_config_bool(var, value);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
return git_default_config(var, value, data);
|
return git_default_config(var, value, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -99,6 +99,8 @@ case "$(git config --bool commit.gpgsign)" in
|
||||||
true) gpg_sign_opt=-S ;;
|
true) gpg_sign_opt=-S ;;
|
||||||
*) gpg_sign_opt= ;;
|
*) gpg_sign_opt= ;;
|
||||||
esac
|
esac
|
||||||
|
test "$(git config --bool rebase.reschedulefailedexec)" = "true" &&
|
||||||
|
reschedule_failed_exec=--reschedule-failed-exec
|
||||||
. git-rebase--common
|
. git-rebase--common
|
||||||
|
|
||||||
read_basic_state () {
|
read_basic_state () {
|
||||||
|
|
|
@ -257,7 +257,12 @@ test_expect_success 'the todo command "break" works' '
|
||||||
test_expect_success '--reschedule-failed-exec' '
|
test_expect_success '--reschedule-failed-exec' '
|
||||||
test_when_finished "git rebase --abort" &&
|
test_when_finished "git rebase --abort" &&
|
||||||
test_must_fail git rebase -x false --reschedule-failed-exec HEAD^ &&
|
test_must_fail git rebase -x false --reschedule-failed-exec HEAD^ &&
|
||||||
grep "^exec false" .git/rebase-merge/git-rebase-todo
|
grep "^exec false" .git/rebase-merge/git-rebase-todo &&
|
||||||
|
git rebase --abort &&
|
||||||
|
test_must_fail git -c rebase.rescheduleFailedExec=true \
|
||||||
|
rebase -x false HEAD^ 2>err &&
|
||||||
|
grep "^exec false" .git/rebase-merge/git-rebase-todo &&
|
||||||
|
test_i18ngrep "has been rescheduled" err
|
||||||
'
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue