fix(push): push renamed branch to its same-named upstream - #108
Open
patrick-cst1 wants to merge 1 commit into
Open
patrick-cst1 wants to merge 1 commit into
patrick-cst1 wants to merge 1 commit into
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
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.
Summary
git branch -m old newkeeps the upstream config pointing at the old remote branch, so a baregit pushfails with "The upstream branch of your current branch does not match".pushCurrentBranchnow detects the name mismatch and pushesrefs/heads/<newName>with-u, publishing the renamed branch and retargeting the upstream; matching-name pushes are unchanged.Related Issue
Closes #97
Changes
GitService.pushCurrentBranch+MainPanelrouting for bare push messages.Type of Change
Testing
mainand pass with the fix.git pushafter a rename reproduces the reported error;git push -u origin <newname>succeeds and later bare pushes work.-npx tsc --noEmitclean.main; focused tests pass.Caveats