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

Backport #22514

Co-authored-by: Brecht Van Lommel <brecht@blender.org>

diff --git a/services/issue/commit.go b/services/issue/commit.go
index c8cfa6cc8a6c72c30677adf83afe2542b631ea22..b17f0e952c05e4662dd095986385233b5ae27f01 100644 (file)
--- a/services/issue/commit.go
+++ b/services/issue/commit.go
@@ -19,6 +19,7 @@ import (
        repo_model "code.gitea.io/gitea/models/repo"
        user_model "code.gitea.io/gitea/models/user"
        "code.gitea.io/gitea/modules/container"
+       "code.gitea.io/gitea/modules/git"
        "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/references"
        "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 the issue was specified to be in a particular branch, don't allow commits in other branches to close it
                                if refIssue.Ref != "" {
-                                       if branchName != refIssue.Ref {
+                                       issueBranchName := strings.TrimPrefix(refIssue.Ref, git.BranchPrefix)
+                                       if branchName != issueBranchName {
                                                continue
                                        }
                                        // Otherwise, only process commits to the default branch