Fix Pull Merge when tag with same name as base branch exist #13882
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
fix dst refspec error in 'Push back to upstream' when base branch have same name with a tag. fix go-gitea#13851 Signed-off-by: a1012112796 <1012112796@qq.com>
Codecov Report
@@ Coverage Diff @@
## master #13882 +/- ##
==========================================
- Coverage 42.27% 42.26% -0.02%
==========================================
Files 708 708
Lines 77191 77191
==========================================
- Hits 32634 32621 -13
- Misses 39198 39199 +1
- Partials 5359 5371 +12
Continue to review full report at Codecov.
|
GiteaBot
added
the
lgtm/need 2
6543
approved these changes
Dec 7, 2020
GiteaBot
added
lgtm/need 1
zeripath
approved these changes
Dec 7, 2020
GiteaBot
added
lgtm/done
6543
changed the title
|
@a1012112796 pleace backport ;) |
a1012112796
added a commit
to a1012112796/gitea
that referenced
this pull request
Dec 8, 2020
…#13882) fix dst refspec error in 'Push back to upstream' when base branch have same name with a tag. fix go-gitea#13851 Signed-off-by: a1012112796 <1012112796@qq.com> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: zeripath <art27@cantab.net>
4 tasks
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Dec 14, 2020
go-gitea#13882 has revealed that the refname of an action is actually only a refname pattern and necessarily a branch. For examplem pushing to refs/heads/master will result in action with refname refs/heads/master but pushing to master will result in a refname master. The simplest solution to providing a fix here is to trim the prefix therefore this PR proposes this. Signed-off-by: Andrew Thornton <art27@cantab.net>
lafriks
pushed a commit
that referenced
this pull request
Dec 14, 2020
* Trim the branch prefix from action.GetBranch #13882 has revealed that the refname of an action is actually only a refname pattern and necessarily a branch. For examplem pushing to refs/heads/master will result in action with refname refs/heads/master but pushing to master will result in a refname master. The simplest solution to providing a fix here is to trim the prefix therefore this PR proposes this. Signed-off-by: Andrew Thornton <art27@cantab.net> * Update models/action.go Co-authored-by: a1012112796 <1012112796@qq.com> Co-authored-by: a1012112796 <1012112796@qq.com>
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Dec 14, 2020
Backport go-gitea#13981 go-gitea#13882 has revealed that the refname of an action is actually only a refname pattern and necessarily a branch. For examplem pushing to refs/heads/master will result in action with refname refs/heads/master but pushing to master will result in a refname master. The simplest solution to providing a fix here is to trim the prefix therefore this PR proposes this. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: a1012112796 <1012112796@qq.com>
techknowlogick
pushed a commit
that referenced
this pull request
Dec 14, 2020
Backport #13981 #13882 has revealed that the refname of an action is actually only a refname pattern and necessarily a branch. For examplem pushing to refs/heads/master will result in action with refname refs/heads/master but pushing to master will result in a refname master. The simplest solution to providing a fix here is to trim the prefix therefore this PR proposes this. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: a1012112796 <1012112796@qq.com> Co-authored-by: a1012112796 <1012112796@qq.com>
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.
fix dst refspec error in 'Push back to upstream' when base branch have
same name with a tag.
fix #13851