Update CommitsAhead CommitsBehind on Pull BaseBranch Change too (go-g…

…itea#11912)
ydelafollye · Jul 31, 2020 · ede58eb · ede58eb
1 parent a591288
commit ede58eb
Showing 1 changed file with 10 additions and 1 deletion.
diff --git 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
  }