From 262fce6db4ab87e03926ac7a21bc5e4bea7ea815 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 16 Jun 2020 19:52:33 +0200
Subject: [PATCH] Update CommitsAhead CommitsBehind on Pull BaseBranch Change
too (#11912)
---
services/pull/pull.go | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
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
}