diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-02-06 18:45:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 19:27:17 (GMT) |
| commit | e11ff8975bedc0aae82632c3cb72578c3d7fc0b2 (patch) | |
| tree | 7cb57f640d3a3dfa681969c0d837607623dd7232 /t | |
| parent | 81ef8ee75d5f348d3c71ff633d13d302124e1a5e (diff) | |
| download | git-e11ff8975bedc0aae82632c3cb72578c3d7fc0b2.zip git-e11ff8975bedc0aae82632c3cb72578c3d7fc0b2.tar.gz git-e11ff8975bedc0aae82632c3cb72578c3d7fc0b2.tar.bz2 | |
Revert "rebase: introduce a shortcut for --reschedule-failed-exec"
This patch was contributed only as a tentative "we could introduce a
convenient short option if we do not want to change the default behavior
in the long run" patch, opening the discussion whether other people
agree with deprecating the current behavior in favor of the rescheduling
behavior.
But the consensus on the Git mailing list was that it would make sense
to show a warning in the near future, and flip the default
rebase.rescheduleFailedExec to reschedule failed `exec` commands by
default. See e.g.
<CAGZ79kZL5CRqCDRb6B-EedUm8Z_i4JuSF2=UtwwdRXMitrrOBw@mail.gmail.com>
So let's back out that patch that added the `-y` short option that we
agreed was not necessary or desirable.
This reverts commit 81ef8ee75d5f348d3c71ff633d13d302124e1a5e.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3418-rebase-continue.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 25aaaca..bdaa511 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -262,9 +262,6 @@ test_expect_success '--reschedule-failed-exec' ' 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 && - git rebase --abort && - test_must_fail git rebase -y false HEAD^ 2>err && test_i18ngrep "has been rescheduled" err ' |