fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-25 22:43:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue not auto-closing when it includes a reference to a branch (#22514) (#22521)

Browse source 
Backport #22514

Co-authored-by: Brecht Van Lommel <brecht@blender.org>
This commit is contained in:
John Olheiser 2023-01-19 11:17:44 -06:00 committed by GitHub
parent fa33271157
commit fd7ebaaa9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/issue/commit.go
View file

@ -19,6 +19,7 @@ import (
repo_model "code.gitea.io/gitea/models/repo" repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/container" "code.gitea.io/gitea/modules/container"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/references" "code.gitea.io/gitea/modules/references"
"code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/repository"
@ -176,7 +177,8 @@ func UpdateIssuesCommit(doer *user_model.User, repo *repo_model.Repository, comm
if !repo.CloseIssuesViaCommitInAnyBranch { if !repo.CloseIssuesViaCommitInAnyBranch {
// If the issue was specified to be in a particular branch, don't allow commits in other branches to close it // If the issue was specified to be in a particular branch, don't allow commits in other branches to close it
if refIssue.Ref != "" { if refIssue.Ref != "" {
if branchName != refIssue.Ref { issueBranchName := strings.TrimPrefix(refIssue.Ref, git.BranchPrefix)
if branchName != issueBranchName {
continue continue
} }
// Otherwise, only process commits to the default branch // Otherwise, only process commits to the default branch