Only update merge_base if not already merged (#10909)

* Only update merge_base if not already merged Fix #10766 Signed-off-by: Andrew Thornton <art27@cantab.net> * Prevent race in transfer pull request * Update services/pull/pull.go
go-gitea · Apr 1, 2020 · bfce841 · bfce841
1 parent 139fc7c
commit bfce841
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/services/pull/check.go b/services/pull/check.go
@@ -47,7 +47,7 @@ func checkAndUpdateStatus(pr *models.PullRequest) {
 
 	// Make sure there is no waiting test to process before leaving the checking status.
 	if !pullRequestQueue.Exist(pr.ID) {
-		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)
 		}
 	}

diff --git a/services/pull/pull.go b/services/pull/pull.go
@@ -115,7 +115,7 @@ func ChangeTargetBranch(pr *models.PullRequest, doer *models.User, targetBranch
 	if pr.Status == models.PullRequestStatusChecking {
 		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
 	}