Avoid MoreThanOne error when creating a branch whose name conflicts with other ref names #19591
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
a1012112796
reviewed
May 3, 2022
GiteaBot
added
the
lgtm/need 2
99rgosse
force-pushed
the
backport_Branch_Error_#19346
branch
from
e321de6
to
721a394
Compare
wxiaoguang
approved these changes
May 3, 2022
GiteaBot
added
lgtm/need 1
6543
approved these changes
May 3, 2022
GiteaBot
added
lgtm/done
wxiaoguang
changed the title
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.
Hi ! this is the backport of #19557
This simple commit will ensure that we specify the "Branch" prefix when we want to create new branch. Fix #19346
Otherwise git would check between /refs/heads/tags and /refs/heads/branch and return
error: src refspec mytest matches more than one.
error: failed to push some refs to 'branch'
when there is a tag sharing the same name than the branch.
Tested also since we discussed in comments :
1 - making a branch named "thistag"
2 - creating a tag from it named "thistag"
3 - created a branch from the branch "thistag"
4 - created a PR from the new branch into branch "thistag", merged it, this works too !
Have a good day