diff options
| -rw-r--r-- | services/pull/pull.go | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/services/pull/pull.go b/services/pull/pull.go index f7a187848a..b94a46639a 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -166,7 +166,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 } |