Update CommitsAhead CommitsBehind on Pull BaseBranch Change too (#11912) (#11915)

* Update CommitsAhead CommitsBehind on Pull BaseBranch Change too (#11912)

* CI.restart()
pull/11934/head
6543 4 years ago committed by GitHub
parent 6abb8d751c
commit 47a5c8e1f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      services/pull/pull.go

@ -128,7 +128,16 @@ func ChangeTargetBranch(pr *models.PullRequest, doer *models.User, targetBranch
if pr.Status == models.PullRequestStatusChecking {
pr.Status = models.PullRequestStatusMergeable
}
if err := pr.UpdateColsIfNotMerged("merge_base", "status", "conflicted_files", "base_branch"); err != nil {
// Update Commit Divergence
divergence, err := GetDiverging(pr)
if err != nil {
return err
}
pr.CommitsAhead = divergence.Ahead
pr.CommitsBehind = divergence.Behind
if err := pr.UpdateColsIfNotMerged("merge_base", "status", "conflicted_files", "base_branch", "commits_ahead", "commits_behind"); err != nil {
return err
}

Loading…
Cancel
Save