Skip to content

Make rebase.reschedulefailedexec less overzealous #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

dscho
Copy link
Member

@dscho dscho commented Jun 3, 2019

This config setting is pretty useful, but it unfortunately stops all non-interactive rebases with a bogus error message. This patch fixes that.

Reported via a commit comment on GitHub.

Changes since v1:

  • Based on Junio's advice, the commit message was improved considerably.
  • The error message now also mentions --exec, so that users do not have to know that --exec implies the interactive backend.

Cc: Vas Sudanagunta [email protected]

@dscho dscho added the ready to submit Has commits that have not been submitted yet label Jun 3, 2019
@dscho
Copy link
Member Author

dscho commented Jun 3, 2019

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@dscho
Copy link
Member Author

dscho commented Jun 3, 2019

/azp run "CI for GitGitGadget's Git fork"

@azure-pipelines
Copy link

No pipelines are associated with this pull request.

dscho referenced this pull request in git/git Jun 3, 2019
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 <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
@dscho
Copy link
Member Author

dscho commented Jun 27, 2019

/submit

@gitgitgadget
Copy link

gitgitgadget bot commented Jun 27, 2019

Submitted as [email protected]

@dscho dscho removed the ready to submit Has commits that have not been submitted yet label Jun 27, 2019
@gitgitgadget
Copy link

gitgitgadget bot commented Jun 27, 2019

This branch is now known as js/rebase-reschedule-applies-only-to-interactive.

@gitgitgadget
Copy link

gitgitgadget bot commented Jun 27, 2019

This patch series was integrated into pu via git@9f851e5.

@gitgitgadget gitgitgadget bot added the pu label Jun 27, 2019
@gitgitgadget
Copy link

gitgitgadget bot commented Jun 28, 2019

This patch series was integrated into pu via git@6e4d64a.

@gitgitgadget
Copy link

gitgitgadget bot commented Jun 28, 2019

This patch series was integrated into pu via git@de4605e.

@dscho dscho force-pushed the reschedule-failed-exec-gently branch 2 times, most recently from adc54cb to beaeb24 Compare June 28, 2019 11:49
The `exec` command is specific to the interactive backend, therefore it
does not make sense for non-interactive rebases to heed that config
setting.

We still want to error out if a non-interactive rebase is started with
`--reschedule-failed-exec`, of course.

Reported by Vas Sudanagunta via:
git@969de3ff0e0#commitcomment-33257187

Signed-off-by: Johannes Schindelin <[email protected]>
@gitgitgadget
Copy link

gitgitgadget bot commented Jun 28, 2019

This patch series was integrated into pu via git@d6d7f71.

@dscho
Copy link
Member Author

dscho commented Jul 1, 2019

/submit

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 1, 2019

Submitted as [email protected]

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 1, 2019

This patch series was integrated into pu via git@70e16b5.

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 2, 2019

This patch series was integrated into pu via git@76931b3.

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 3, 2019

This patch series was integrated into pu via git@baf4495.

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 3, 2019

This patch series was integrated into pu via git@f82cffc.

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 9, 2019

This patch series was integrated into pu via git@b19e6ae.

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 10, 2019

This patch series was integrated into pu via git@6de25cc.

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 10, 2019

This patch series was integrated into next via git@a13c744.

@gitgitgadget gitgitgadget bot added the next label Jul 10, 2019
@gitgitgadget
Copy link

gitgitgadget bot commented Jul 12, 2019

This patch series was integrated into pu via git@64096fb.

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 12, 2019

This patch series was integrated into next via git@64096fb.

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 12, 2019

This patch series was integrated into master via git@64096fb.

@gitgitgadget gitgitgadget bot added the master label Jul 12, 2019
@gitgitgadget gitgitgadget bot closed this Jul 12, 2019
@gitgitgadget
Copy link

gitgitgadget bot commented Jul 12, 2019

Closed via 64096fb.

@dscho dscho deleted the reschedule-failed-exec-gently branch July 15, 2019 11:43
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