Use GitHub Pull Request reference for merging #257
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Rather than fetching the forks, this fetches the remote associated with the pull request as described https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/checking-out-pull-requests-locally. In the case of deleted forks, this should improve the robustness of the merge command. It might also result in slight performance improvements as only the relevant commits will be fetches rather than all the branches of the forks.
|
After initial testing, it looks like this PR also solves an issue I ran into with private repositories, where the build system does not have access to the private forks. My approach was to use the GitHub token and the |
|
Thanks @knabar for testing this and glad to see it is helping in a different context than the one targeted originally. |
|
Now released as https://pypi.org/project/scc/0.12.6/ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rather than fetching the forks, this fetches the remote associated with the
pull request as described in https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/checking-out-pull-requests-locally.
In the case of deleted forks, this should improve the robustness of the merge
command. It might also result in slight performance improvements as only the
relevant commits will be fetched as opposed to all the branches of the forks.
See also #219 which is a RFE using a similar strategy for the rebase command