core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
6543 2020-06-16 19:52:33 +02:00 committed by GitHub
parent f399cd326b
commit 262fce6db4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
services/pull/pull.go
View File

@ -166,7 +166,16 @@ func ChangeTargetBranch(pr *models.PullRequest, doer *models.User, targetBranch
if pr.Status == models.PullRequestStatusChecking { if pr.Status == models.PullRequestStatusChecking {
pr.Status = models.PullRequestStatusMergeable 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 return err
} }