aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-11-04 08:17:24 -05:00
Code

Only update merge_base in checker if not already merged (#10908)

Browse Source 
Fix #10766

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
zeripath 2020-04-01 13:02:11 +01:00 committed by GitHub
parent fbb0880d37
commit 408bc2c8b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/pull/check.go
View File

@ -61,7 +61,7 @@ func checkAndUpdateStatus(pr *models.PullRequest) {
} }
if !has { if !has {
if err := pr.UpdateCols("merge_base", "status", "conflicted_files"); err != nil { if err := pr.UpdateColsIfNotMerged("merge_base", "status", "conflicted_files"); err != nil {
log.Error("Update[%d]: %v", pr.ID, err) log.Error("Update[%d]: %v", pr.ID, err)
} }
} }

2
services/pull/pull.go
View File

@ -120,7 +120,7 @@ func ChangeTargetBranch(pr *models.PullRequest, doer *models.User, targetBranch
if pr.Status == models.PullRequestStatusChecking { if pr.Status == models.PullRequestStatusChecking {
pr.Status = models.PullRequestStatusMergeable pr.Status = models.PullRequestStatusMergeable
} }
if err := pr.UpdateCols("status, conflicted_files, base_branch"); err != nil { if err := pr.UpdateColsIfNotMerged("merge_base", "status", "conflicted_files", "base_branch"); err != nil {
return err return err
} }