aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiteabot <teabot@gitea.io>2023-03-04 13:02:50 -0500
committerGitHub <noreply@github.com>2023-03-04 19:02:50 +0100
commit8142408d3a95a97f305a12d3d1f9b1731211d0dd (patch)
treebbd2d636617bccac4076a75a2aa6a07cfcfa611a
parenta4158d1904b04c4f4b499cf8b9505aca3bb70d11 (diff)
downloadgitea-8142408d3a95a97f305a12d3d1f9b1731211d0dd.tar.gz
gitea-8142408d3a95a97f305a12d3d1f9b1731211d0dd.zip
Fill head commit to in payload when notifying push commits for mirroring (#23215) (#23292)
Backport #23215 Just like what has been done when pushing manually: https://github.com/go-gitea/gitea/blob/7a5af25592003ddc3017fcd7b822a3e02fc40ef6/services/repository/push.go#L225-L226 Before: <img width="448" alt="image" src="https://user-images.githubusercontent.com/9418365/222100123-cd4839d1-2d4d-45f7-7a0-0cbc73162b44.png"> After: <img width="448" alt="image" src="https://user-images.githubusercontent.com/9418365/222100225-3c5bb65-7ab9-41e2-8e39-9d84c23c352d.png"> Co-authored-by: Jason Song <i@wolfogre.com> Co-authored-by: delvh <dev.lh@web.de> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
-rw-r--r--services/mirror/mirror_pull.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go
index 126d2bf354..60699294c1 100644
--- a/services/mirror/mirror_pull.go
+++ b/services/mirror/mirror_pull.go
@@ -499,6 +499,13 @@ func SyncPullMirror(ctx context.Context, repoID int64) bool {
theCommits.Commits = theCommits.Commits[:setting.UI.FeedMaxCommitNum]
}
+ if newCommit, err := gitRepo.GetCommit(newCommitID); err != nil {
+ log.Error("SyncMirrors [repo: %-v]: unable to get commit %s: %v", m.Repo, newCommitID, err)
+ continue
+ } else {
+ theCommits.HeadCommit = repo_module.CommitToPushCommit(newCommit)
+ }
+
theCommits.CompareURL = m.Repo.ComposeCompareURL(oldCommitID, newCommitID)
notification.NotifySyncPushCommits(ctx, m.Repo.MustOwner(ctx), m.Repo, &repo_module.PushUpdateOptions{