tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-03 09:07:19 +00:00
Code Releases Activity

Fix checks in PR for empty commits #19603 (#20290)

Browse Source 
* Fixes issue #19603 (Not able to merge commit in PR when branches content is same, but different commit id)
* fill HeadCommitID in PullRequest
* compare real commits ID as check for merging
* based on @zeripath patch in #19738
This commit is contained in:
Ing. Jaroslav Šafka
2022-07-13 10:22:51 +02:00
committed by GitHub
parent b7c6ec91ba
commit 8420c1bf4c
7 changed files with 58 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/pull/check.go
View File

@ -89,7 +89,7 @@ func CheckPullMergable(stdCtx context.Context, doer *user_model.User, perm *acce
return ErrIsWorkInProgress
}
if !pr.CanAutoMerge() {
if !pr.CanAutoMerge() && !pr.IsEmpty() {
return ErrNotMergableState
}