diff options
| author | John Olheiser <john.olheiser@gmail.com> | 2023-01-19 11:17:44 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-19 11:17:44 -0600 |
| commit | fd7ebaaa9cba1b14c871d27dcb688d1807495f2f (patch) | |
| tree | c4e8c1d4e85f3711e4b6d7a41b2cd5e0e24bef71 /services | |
| parent | fa332711575adb54e1c5d78e151dd53c8a67530a (diff) | |
| download | gitea-fd7ebaaa9cba1b14c871d27dcb688d1807495f2f.tar.gz gitea-fd7ebaaa9cba1b14c871d27dcb688d1807495f2f.zip | |
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>
Diffstat (limited to 'services')
| -rw-r--r-- | services/issue/commit.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/issue/commit.go b/services/issue/commit.go index c8cfa6cc8a..b17f0e952c 100644 --- 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 |