Skip to content

Commit 3dbf001

Browse files
lunnyGiteaBot
authored andcommitted
Fix missed merge commit sha and time when migrating from codecommit (go-gitea#34645)
Fix go-gitea#34627
1 parent 1b78894 commit 3dbf001

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

services/migrations/codecommit.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,10 @@ func (c *CodeCommitDownloader) GetPullRequests(ctx context.Context, page, perPag
210210
pr.State = "closed"
211211
pr.Closed = orig.LastActivityDate
212212
}
213+
if pr.Merged {
214+
pr.MergeCommitSHA = *target.MergeMetadata.MergeCommitId
215+
pr.MergedTime = orig.LastActivityDate
216+
}
213217

214218
_ = CheckAndEnsureSafePR(pr, c.baseURL, c)
215219
prs = append(prs, pr)

0 commit comments

Comments
 (0)