Gitea-John71/Gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-08-29 20:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(automerge): fix error handling, populate recent automerge tasks on restart (#39001)

Browse Source 
* Refactor "automerge" related code, clarify many details (including "unique queue item", start check by pull head or commit)
* Fix automerge queue handler's error handling, clarify error messages
* Populate recent automerge tasks on restart to restore the previous aborted automerge tasks

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Willem Kokke
2026-08-28 22:17:01 +01:00
committed by GitHub
parent 1652dfe62a
commit 60326ca03d
15 changed files with 246 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/pull/check.go
+1 -1
View File
@@ -297,7 +297,7 @@ func markPullRequestAsMergeable(ctx context.Context, pr *issues_model.PullReques
} else if !exist {
return
}
automergequeue.StartPRCheckAndAutoMerge(ctx, pr)
automergequeue.StartAutoMergeCheckByPullHead(ctx, pr)
}
// getMergeCommit checks if a pull request has been merged