tyler.durden/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-06-19 13:10:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix missed merge commit sha and time when migrating from codecommit (#34645) (#34650)

Browse Source 
Backport #34645 by @lunny

Fix #34627

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
Giteabot 2025-06-09 12:21:27 +08:00 committed by GitHub
parent 1b788946a7
commit 468d1919b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/migrations/codecommit.go
View File

@ -210,6 +210,10 @@ func (c *CodeCommitDownloader) GetPullRequests(ctx context.Context, page, perPag
pr.State = "closed" pr.State = "closed"
pr.Closed = orig.LastActivityDate pr.Closed = orig.LastActivityDate
} }
if pr.Merged {
pr.MergeCommitSHA = *target.MergeMetadata.MergeCommitId
pr.MergedTime = orig.LastActivityDate
}
_ = CheckAndEnsureSafePR(pr, c.baseURL, c) _ = CheckAndEnsureSafePR(pr, c.baseURL, c)
prs = append(prs, pr) prs = append(prs, pr)