Skip to content

Commit 47a5c8e

Browse files
authored
Update CommitsAhead CommitsBehind on Pull BaseBranch Change too (#11912) (#11915)
* Update CommitsAhead CommitsBehind on Pull BaseBranch Change too (#11912) * CI.restart()
1 parent 6abb8d7 commit 47a5c8e

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

services/pull/pull.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,16 @@ func ChangeTargetBranch(pr *models.PullRequest, doer *models.User, targetBranch
128128
if pr.Status == models.PullRequestStatusChecking {
129129
pr.Status = models.PullRequestStatusMergeable
130130
}
131-
if err := pr.UpdateColsIfNotMerged("merge_base", "status", "conflicted_files", "base_branch"); err != nil {
131+
132+
// Update Commit Divergence
133+
divergence, err := GetDiverging(pr)
134+
if err != nil {
135+
return err
136+
}
137+
pr.CommitsAhead = divergence.Ahead
138+
pr.CommitsBehind = divergence.Behind
139+
140+
if err := pr.UpdateColsIfNotMerged("merge_base", "status", "conflicted_files", "base_branch", "commits_ahead", "commits_behind"); err != nil {
132141
return err
133142
}
134143

0 commit comments

Comments
 (0)