Skip to content

rebase: drop the unwanted -y

Johannes Schindelin via GitGitGadget git 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest1 patch 1 replyIn review
  2. v11 patch 1 replySuperseded

Changes in v2 from the cover letter

* Focused on the "why?" in the commit message.

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/1Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Documentation/git-rebase.txt builtin/rebase.c git-legacy-rebase.sh +1 more+0 -360 replies

Reviews trailers per patch

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

Read the v2 thread

Cover letter [PATCH v2 0/1] rebase: drop the unwanted -y

I totally missed that this patch made it into next, and then master. Sorry about that.

Changes since v1:

* Focused on the "why?" in the commit message.

Johannes Schindelin (1):
Revert "rebase: introduce a shortcut for --reschedule-failed-exec"

 Documentation/git-rebase.txt |  6 ------
 builtin/rebase.c             | 21 ---------------------
 git-legacy-rebase.sh         |  6 ------
 t/t3418-rebase-continue.sh   |  3 ---
 4 files changed, 36 deletions(-)

base-commit: b5101f929789889c2e536d915698f58d5c5c6b7a
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-118%2Fdscho%2Frevert-rebase-y-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-118/dscho/revert-rebase-y-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/118

Range-diff vs v1:

1: e61ebc3060 ! 1: a4857fb32d Revert "rebase: introduce a shortcut for --reschedule-failed-exec"
@@ -2,22 +2,20 @@

Revert "rebase: introduce a shortcut for --reschedule-failed-exec"

- When contributing the patch series, the cover letter tried to convey
- clearly that the patch introducing the shortcut -y was included only to
- show that it is possible, with a slight bias against it.
+ 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.

- During the review, there were a couple reviewers who agreed with this
- sentiment, and the author was happy that this patch was not needed and
- concurred that it should be dropped. See e.g. Stefan Beller's reply:
+ 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>

- However, it slipped by the original patch author (yours truly) that the
- patch *was* included when the branch made it to next and then when it
- made it to master.
-
- So let's back out that patch before it even slips into an official
- release (in which case we would even have to support this unwanted
- flag).
+ 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.

Signature · 1 line
gitgitgadget