[flutter_conductor] fix initialref to explicitly include remote name #96481
Conversation
This file contains hidden or 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
flutter-dashboard
bot
added
the
c: contributor-productivity
christopherfujino
changed the title
godofredoc
reviewed
Jan 11, 2022
| engine = EngineRepository( | ||
| checkouts, | ||
| initialRef: candidateBranch, | ||
| initialRef: 'upstream/$candidateBranch', |
Contributor
There was a problem hiding this comment.
Will we get an error during the checkout if the branch already exists in the fork?
Contributor
Author
There was a problem hiding this comment.
By namespacing by the upstream remote name, git will disregard the fork's branches. This is an unambiguous reference, and will only error if the git cannot fetch the given branch from the upstream remote (either because the branch name that was input was wrong or because it couldn't reach the server).
if you only provide the branch name, git will check all remotes and find which has the branch in question, which was what happened in #96425.
Contributor
There was a problem hiding this comment.
Awesome, thanks for the explanation.
godofredoc
approved these changes
Jan 12, 2022
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/plugins
that referenced
this pull request
Jan 18, 2022
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/plugins
that referenced
this pull request
Jan 18, 2022
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/plugins
that referenced
this pull request
Jan 18, 2022
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/plugins
that referenced
this pull request
Feb 4, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
When cloning the framework and engine repos as part of the
conductor startflow, explicitly checkout the candidate branch from theupstreamremote, in case both the upstream AND mirror repo have the branch and then git cannot disambiguate.Fixes #96425
Remove code to have the conductor update .ci.yaml with the candidate branch name; this is no longer needed after flutter/cocoon#1468
Fixes #96437