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>
Johannes Schindelin committed
Dec 10, 2018 at 11:04 UTC
969de3ff0e01282cc061892f47b5f04b22de76af
4 files changed
+18
-1
Documentation/config/rebase.txt
+5
@@ -64,3 +64,8 @@ instead of:
64
-------------------------------------------
65
+
66
Defaults to false.
67
+
68
+rebase.rescheduleFailedExec::
69
+ Automatically reschedule `exec` commands that failed. This only makes
70
+ sense in interactive mode (or when an `--exec` option was provided).
71
+ This is the same as specifying the `--reschedule-failed-exec` option.
builtin/rebase.c
+5
@@ -677,6 +677,11 @@ static int rebase_config(const char *var, const char *value, void *data)
677
return 0;
678
}
679
680
+ if (!strcmp(var, "rebase.reschedulefailedexec")) {
681
+ opts->reschedule_failed_exec = git_config_bool(var, value);
682
+ return 0;
683
+ }
684
+
685
return git_default_config(var, value, data);
686
}
687
git-legacy-rebase.sh
+2
@@ -99,6 +99,8 @@ case "$(git config --bool commit.gpgsign)" in
99
true) gpg_sign_opt=-S ;;
100
*) gpg_sign_opt= ;;
101
esac
102
+test "$(git config --bool rebase.reschedulefailedexec)" = "true" &&
103
+reschedule_failed_exec=--reschedule-failed-exec
104
. git-rebase--common
105
106
read_basic_state () {
t/t3418-rebase-continue.sh
+6
-1
@@ -257,7 +257,12 @@ test_expect_success 'the todo command "break" works' '
257
test_expect_success '--reschedule-failed-exec' '
258
test_when_finished "git rebase --abort" &&
259
test_must_fail git rebase -x false --reschedule-failed-exec HEAD^ &&
260
- grep "^exec false" .git/rebase-merge/git-rebase-todo
260
+ grep "^exec false" .git/rebase-merge/git-rebase-todo &&
261
+ git rebase --abort &&
262
+ test_must_fail git -c rebase.rescheduleFailedExec=true \
263
+ rebase -x false HEAD^ 2>err &&
264
+ grep "^exec false" .git/rebase-merge/git-rebase-todo &&
265
+ test_i18ngrep "has been rescheduled" err
266
'
267
268
test_done