Allow update from contribution target unless you're on it #15309
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
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.
Closes #15299
Description
This is a follow-up to #14199 which enabled updating from the contribution target's default branch instead of the default branch of the origin remote. We seem to have forgotten to update the logic for determining when such a merge is possible. Previously we deemed it possible as long as we weren't on the default branch (since the default branch was always the source of the merge) whereas now we need to look at whether we're currently on the default branch of the contribution target or not (which may be the default branch of the origin remote).
Release notes
Notes: [Fixed] Enable update from upstream default branch when contributing to a fork