Skip to content

Conversation

dscho
Copy link
Member

@dscho dscho commented Feb 5, 2019

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.

@dscho
Copy link
Member Author

dscho commented Feb 5, 2019

/submit

@gitgitgadget
Copy link

gitgitgadget bot commented Feb 5, 2019

Submitted as pull.118.git.gitgitgadget@gmail.com

@gitgitgadget
Copy link

gitgitgadget bot commented Feb 5, 2019

This branch is now known as js/rebase-i-redo-exec-fix.

@gitgitgadget
Copy link

gitgitgadget bot commented Feb 5, 2019

This patch series was integrated into pu via git@5c453a7.

@gitgitgadget gitgitgadget bot added the pu label Feb 5, 2019
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 81ef8ee.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Copy link
Member Author

dscho commented Feb 6, 2019

/submit

@gitgitgadget
Copy link

gitgitgadget bot commented Feb 6, 2019

Submitted as pull.118.v2.git.gitgitgadget@gmail.com

@gitgitgadget
Copy link

gitgitgadget bot commented Feb 6, 2019

On the Git mailing list, Junio C Hamano wrote (reply to this):

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:

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

Will queue.  Let's make sure -y won't escape to the released
version(s).

Thanks for a quick update.  

@dscho
Copy link
Member Author

dscho commented Feb 12, 2019

Made it into master via b966813

@dscho dscho closed this Feb 12, 2019
@dscho dscho deleted the revert-rebase-y branch February 12, 2019 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant