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.

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

PR Error 500 with branch and tag sharing the same name #15592

Closed
2 of 6 tasks
Berjou opened this issue Apr 22, 2021 · 1 comment · Fixed by #16040
Closed
2 of 6 tasks

PR Error 500 with branch and tag sharing the same name #15592

Berjou opened this issue Apr 22, 2021 · 1 comment · Fixed by #16040
Labels

Comments

@Berjou
Copy link

Berjou commented Apr 22, 2021

  • Gitea version (or commit ref): 1.14.1

  • Git version: 2.30.2

  • Operating system: docker image gitea/gitea:1

  • Database:

    • PostgreSQL
    • MySQL
    • MSSQL
    • SQLite
  • Can you reproduce the bug at https://try.gitea.io:

  • Log gist:
    Sorry, tinkering a lot with my setup right now, the log are no longer present on my machine, and since the issue is easily reproductible, it should not be a problem. However, I'm happy to provide you specific logs if needed.

Description

  • git checkout -b same-tag-and-branch-name-test
  • Create a commit and git push origin same-tag-and-branch-name-test
  • git tag same-tag-and-branch-name-test
  • git push origin tag same-tag-and-branch-name-test
  • Create a pull request to merge same-tag-and-branch-name-test into master
  • Now https://gitea-instance/user/repo/pulls return an error 500
  • Note that we can see the pull request by accessing https://gitea-instance/user/repo/1

Notes:
After deleting the branch and tag, pushing my commit to a new brarnch with a different name, and opening a new pull request, the error 500 on https://gitea-instance/user/repo/pulls is gone. However, after merging the merge request, and now that there is no more opened PR, the error 500 came back.

Hope this issue can be fixed, and that someone could help me to fix my broken repository.

@Viktor-Yakovchuk
Copy link
Contributor

I have reproduced similar problem on Gitea Version: 1.15.0+dev-252-ga69fb523a
But I have 500 error on the compare page: http://localhost:3000/viktor/test/compare/master...test500

I have a plan to fix it soon.

@lunny lunny added the type/bug label May 24, 2021
Viktor-Yakovchuk added a commit to Viktor-Yakovchuk/gitea that referenced this issue May 31, 2021
Fixed 500 error while create Pull request when there are more
than one sources (branch, tag) with the same name

Fix go-gitea#15592

Signed-off-by: Viktor Yakovchuk <[email protected]>
techknowlogick added a commit that referenced this issue Jun 23, 2021
* Fix 500 Error with branch and tag sharing the same name #15592

Fixed 500 error while create Pull request when there are more
than one sources (branch, tag) with the same name

Fix #15592

Signed-off-by: Viktor Yakovchuk <[email protected]>

* fix logging

Co-authored-by: techknowlogick <[email protected]>
Co-authored-by: 6543 <[email protected]>
AbdulrhmnGhanem pushed a commit to kitspace/gitea that referenced this issue Aug 10, 2021
go-gitea#16040)

* Fix 500 Error with branch and tag sharing the same name go-gitea#15592

Fixed 500 error while create Pull request when there are more
than one sources (branch, tag) with the same name

Fix go-gitea#15592

Signed-off-by: Viktor Yakovchuk <[email protected]>

* fix logging

Co-authored-by: techknowlogick <[email protected]>
Co-authored-by: 6543 <[email protected]>
@go-gitea go-gitea locked and limited conversation to collaborators Oct 19, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants