Fixed issues not updated by commits (#16254)
`UpdateIssuesCommit` may get called with fewer commits because of `FeedMaxCommitNum` and therefore may miss some commands.
This commit is contained in:
parent
622f1e764c
commit
e673e42f7e
1 changed files with 5 additions and 4 deletions
|
@ -193,16 +193,17 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
commits = repo_module.ListToPushCommits(l)
|
commits = repo_module.ListToPushCommits(l)
|
||||||
|
|
||||||
|
if err := repofiles.UpdateIssuesCommit(pusher, repo, commits.Commits, refName); err != nil {
|
||||||
|
log.Error("updateIssuesCommit: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
if len(commits.Commits) > setting.UI.FeedMaxCommitNum {
|
if len(commits.Commits) > setting.UI.FeedMaxCommitNum {
|
||||||
commits.Commits = commits.Commits[:setting.UI.FeedMaxCommitNum]
|
commits.Commits = commits.Commits[:setting.UI.FeedMaxCommitNum]
|
||||||
}
|
}
|
||||||
commits.CompareURL = repo.ComposeCompareURL(opts.OldCommitID, opts.NewCommitID)
|
commits.CompareURL = repo.ComposeCompareURL(opts.OldCommitID, opts.NewCommitID)
|
||||||
notification.NotifyPushCommits(pusher, repo, opts, commits)
|
notification.NotifyPushCommits(pusher, repo, opts, commits)
|
||||||
|
|
||||||
if err := repofiles.UpdateIssuesCommit(pusher, repo, commits.Commits, refName); err != nil {
|
|
||||||
log.Error("updateIssuesCommit: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err = models.RemoveDeletedBranch(repo.ID, branch); err != nil {
|
if err = models.RemoveDeletedBranch(repo.ID, branch); err != nil {
|
||||||
log.Error("models.RemoveDeletedBranch %s/%s failed: %v", repo.ID, branch, err)
|
log.Error("models.RemoveDeletedBranch %s/%s failed: %v", repo.ID, branch, err)
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue