浏览代码

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

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

* CI.restart()
tags/v1.12.0
6543 3 年前
父节点
当前提交
47a5c8e1f7
没有帐户链接到提交者的电子邮件
共有 1 个文件被更改,包括 10 次插入1 次删除
  1. 10
    1
      services/pull/pull.go

+ 10
- 1
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
}


正在加载...
取消
保存