foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-21 08:31:27 -05:00
Code Issues Wiki Activity

Use GitLab's squash_commit_sha when available (#27824)

Browse source 
Before this PR, the PR migration code populates Gitea's MergedCommitID
field by using GitLab's merge_commit_sha field. However, that field is
only populated when the PR was merged using a merge strategy. When a
squash strategy is used, squash_commit_sha is populated instead.

Given that Gitea does not keep track of merge and squash commits
separately, this PR simply populates Gitea's MergedCommitID by using
whichever field is present in the GitLab API response.
This commit is contained in:
Sebastian Brückner 2023-10-29 01:54:58 +01:00 committed by GitHub
parent 5a76759c9c
commit 8faa38568b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/migrations/gitlab.go
View file

@ -566,6 +566,11 @@ func (g *GitlabDownloader) GetPullRequests(page, perPage int) ([]*base.PullReque
closeTime = pr.UpdatedAt closeTime = pr.UpdatedAt
} }
mergeCommitSHA := pr.MergeCommitSHA
if mergeCommitSHA == "" {
mergeCommitSHA = pr.SquashCommitSHA
}
var locked bool var locked bool
if pr.State == "locked" { if pr.State == "locked" {
locked = true locked = true
@ -608,7 +613,7 @@ func (g *GitlabDownloader) GetPullRequests(page, perPage int) ([]*base.PullReque
Closed: closeTime, Closed: closeTime,
Labels: labels, Labels: labels,
Merged: merged, Merged: merged,
MergeCommitSHA: pr.MergeCommitSHA, MergeCommitSHA: mergeCommitSHA,
MergedTime: mergeTime, MergedTime: mergeTime,
IsLocked: locked, IsLocked: locked,
Reactions: g.awardsToReactions(reactions), Reactions: g.awardsToReactions(reactions),