This repository was archived by the owner on Mar 10, 2022. It is now read-only.
Fix: Fallback to upstream branch name when remote does not match branch#163
Open
casassg wants to merge 1 commit intosourcegraph:masterfrom
Open
Fix: Fallback to upstream branch name when remote does not match branch#163casassg wants to merge 1 commit intosourcegraph:masterfrom
casassg wants to merge 1 commit intosourcegraph:masterfrom
Conversation
acaf96a to
9b8f688
Compare
Contributor
|
I realized shortly after the extension updated that I ran into the same issue as @casassg in cases where I haven't pushed my branch to upstream (in my testing I did it with a branch that was pushed, but where upstream returned |
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Followup from testing #162.
Normally when there's a mismatch between
upstreamAndBranchandbranchit's better to use the branch name inupstreamAndBranch. When using branch, it may be that branch is not existing in remote and therefore not accessible by SourceGraph (it returns 500 when that's the case). In that sense, it's better to fallback to the branch name included inupstreamAndBranchas that usually points to a branch that does exist upstream.