Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Pull Merge when tag with same name as base branch exist (#13882) #13896

Merged
merged 1 commit into from
Dec 8, 2020
Merged

Fix Pull Merge when tag with same name as base branch exist (#13882) #13896

merged 1 commit into from
Dec 8, 2020

Conversation

a1012112796
Copy link
Member

Backport #13882

@a1012112796 @6543 @zeripath
Fix Pull Merge when tag with same name as base branch exist (go-gitea…
9813e6d 
…#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>
@a1012112796 a1012112796 added this to the 1.13.1 milestone Dec 8, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Dec 8, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Dec 8, 2020
@6543 6543 merged commit c0b1197 into go-gitea:release/v1.13 Dec 8, 2020
@a1012112796 a1012112796 deleted the backport/13882 branch December 8, 2020 16:22
@go-gitea go-gitea locked and limited conversation to collaborators Jan 18, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@6543 6543 6543 approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.13.1
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@a1012112796 @lunny @6543 @GiteaBot