github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-07-16 21:53:50 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

Merging pull request causes 500 error. #3670

New Issue
Closed
opened 2025-11-02 05:21:16 -06:00 by GiteaMirror · 3 comments
GiteaMirror commented 2025-11-02 05:21:16 -06:00
Owner
Copy Link

Originally created by @PershingSquare on GitHub (Jul 25, 2019).

Description

Every time I try to merge a pull request, I get a 500 server error. I have branch protection on master, with 1 approval required before merging.

Screenshots

what_the_page_looks_like

Originally created by @PershingSquare on GitHub (Jul 25, 2019). <!-- NOTE: If your issue is a security concern, please send an email to security@gitea.io instead of opening a public issue --> <!-- 1. Please speak English, this is the language all maintainers can speak and write. 2. Please ask questions or configuration/deploy problems on our Discord server (https://discord.gg/gitea) or forum (https://discourse.gitea.io). 3. Please take a moment to check that your issue doesn't already exist. 4. Please give all relevant information below for bug reports, because incomplete details will be handled as an invalid report. --> - Gitea version (or commit ref): 1.10.0+dev-67-ge0d6d2f97 - Git version: 2.7.4, Git LFS 2.7.2 - Operating system: Alpine Linux v3.10 - Database (use `[x]`): - [ ] PostgreSQL - [ ] MySQL - [ ] MSSQL - [x] SQLite - Can you reproduce the bug at https://try.gitea.io: - [ ] Yes (provide example URL) - [x] No, our repo use git-lfs and I wasn't able to reproduce it on there. - [ ] Not relevant - Log gist: https://gist.github.com/PershingSquare/68118d48e13a082a749870cfa3a5e7cc ## Description Every time I try to merge a pull request, I get a 500 server error. I have branch protection on master, with 1 approval required before merging. ## Screenshots ![what_the_page_looks_like](https://user-images.githubusercontent.com/39250540/61876343-7d7fb580-aea1-11e9-9ba2-56aec8b0b627.PNG) <!-- **If this issue involves the Web Interface, please include a screenshot** -->
GiteaMirror added the type/bug label 2025-11-02 05:21:16 -06:00
GiteaMirror commented 2025-11-02 05:21:17 -06:00
Author
Owner
Copy Link

@zeripath commented on GitHub (Jul 25, 2019):

OK so looking at the gitea.log you've sent it appears that the panic is being caused at line 104 here:

734aa96508/models/branches.go (L102-L108)

This is in turn called from:

734aa96508/models/branches.go (L94-L100)

Which is from line 99 here:

734aa96508/routers/private/hook.go (L89-L105)

@zeripath commented on GitHub (Jul 25, 2019): OK so looking at the gitea.log you've sent it appears that the panic is being caused at line 104 here: https://github.com/go-gitea/gitea/blob/734aa965088fb72330f4ad744c187c614cce3d8b/models/branches.go#L102-L108 This is in turn called from: https://github.com/go-gitea/gitea/blob/734aa965088fb72330f4ad744c187c614cce3d8b/models/branches.go#L94-L100 Which is from line 99 here: https://github.com/go-gitea/gitea/blob/734aa965088fb72330f4ad744c187c614cce3d8b/routers/private/hook.go#L89-L105
GiteaMirror commented 2025-11-02 05:21:17 -06:00
Author
Owner
Copy Link

@zeripath commented on GitHub (Jul 25, 2019):

Now that means that either pr is nil here, or pr.Issue is nil.

@zeripath commented on GitHub (Jul 25, 2019): Now that means that either `pr` is nil here, or `pr.Issue` is nil.
GiteaMirror commented 2025-11-02 05:21:17 -06:00
Author
Owner
Copy Link

@zeripath commented on GitHub (Jul 25, 2019):

OK, simple fix is to change pr.Issue.ID to pr.IssueID. However, when merging it shouldn't be pushing all of the branches so I'll look at that too.

@zeripath commented on GitHub (Jul 25, 2019): OK, simple fix is to change `pr.Issue.ID` to `pr.IssueID`. However, when merging it shouldn't be pushing all of the branches so I'll look at that too.
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
$20
$250
$50
$500
backport/done
💎 Bounty
docs-update-needed
good first issue
hacktoberfest
issue/bounty
issue/confirmed
issue/critical
issue/duplicate
issue/needs-feedback
issue/not-a-bug
issue/regression
issue/stale
issue/workaround
lgtm/need 2
modifies/api
modifies/translation
outdated/backport/v1.18
outdated/theme/markdown
outdated/theme/timetracker
performance/bigrepo
performance/cpu
performance/memory
performance/speed
pr/breaking
proposal/accepted
proposal/rejected
pr/wip
pull-request
Mirrored from GitHub Pull Request
 reviewed/wontfix
💰 Rewarded
skip-changelog
status/blocked
topic/accessibility
topic/api
topic/authentication
topic/build
topic/code-linting
topic/commit-signing
topic/content-rendering
topic/deployment
topic/distribution
topic/federation
topic/gitea-actions
topic/issues
topic/lfs
topic/mobile
topic/moderation
topic/packages
topic/pr
topic/projects
topic/repo
topic/repo-migration
topic/security
topic/theme
topic/ui
topic/ui-interaction
topic/ux
topic/webhooks
topic/wiki
type/bug
type/deprecation
type/docs
type/enhancement
type/feature
type/miscellaneous
type/proposal
type/question
type/refactoring
type/summary
type/testing
type/upstream
No Label type/bug
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#3670
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?