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

Don't merge PR if tag and name of branch with this name #13851

Closed
1 of 6 tasks
melmus opened this issue Dec 4, 2020 · 0 comments · Fixed by #13882
Closed
1 of 6 tasks

Don't merge PR if tag and name of branch with this name #13851

melmus opened this issue Dec 4, 2020 · 0 comments · Fixed by #13882
Labels
type/bug

Comments

@melmus
Copy link

melmus commented Dec 4, 2020

  • Gitea version (or commit ref):
    1.14.0+dev-225-g5bd05331c
  • Git version:
    2.26.2
  • Operating system:
    Ubuntu 18.04.5 LTS
    Gitea running in docker
  • Database (use [x]):
    • PostgreSQL
    • MySQL
    • MSSQL
    • SQLite
  • Can you reproduce the bug at https://try.gitea.io:
    • Yes (provide example URL)
    • No
  • Log gist:

Description

If I merge PR, i see 500-error, because early was created tag = branch name.
I want to see in UI message: "you have tag and name of branch with this name"

2020/12/03 17:26:49 routers/repo/pull.go:916:MergePullRequest() [E] Merge: git push: error: dst refspec RC_Release_2020_3 matches more than one
error: failed to push some refs to '/data/git/repositories/org1/repo_datel.git'

Screenshots
a1012112796 added a commit to a1012112796/gitea that referenced this issue Dec 7, 2020
@a1012112796
fix 'dst refspec error' when merge a pr
3f1535c 
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>
@a1012112796 a1012112796 mentioned this issue Dec 7, 2020
Merged
6543 added a commit that referenced this issue Dec 8, 2020
@a1012112796 @6543 @zeripath
Fix Pull Merge when tag with same name as base branch exist (#13882)
682f0b0 
fix dst refspec error in 'Push back to upstream' when base branch have
same name with a tag.

fix #13851
Signed-off-by: a1012112796 <1012112796@qq.com>

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: zeripath <art27@cantab.net>
a1012112796 added a commit to a1012112796/gitea that referenced this issue Dec 8, 2020
@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>
6543 added a commit that referenced this issue Dec 8, 2020
@a1012112796 @6543 @zeripath
Fix Pull Merge when tag with same name as base branch exist (#13882) (#…
c0b1197 
…13896)

fix dst refspec error in 'Push back to upstream' when base branch have
same name with a tag.

fix #13851
Signed-off-by: a1012112796 <1012112796@qq.com>

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: zeripath <art27@cantab.net>
@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.
Assignees
No one assigned
Labels
type/bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Fix Pull Merge when tag with same name as base branch exist a1012112796/gitea
2 participants
@melmus @a1012112796