Skip to content

Commit 8faa385

Browse files
authored
Use GitLab's squash_commit_sha when available (#27824)
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.
1 parent 5a76759 commit 8faa385

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

services/migrations/gitlab.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,11 @@ func (g *GitlabDownloader) GetPullRequests(page, perPage int) ([]*base.PullReque
566566
closeTime = pr.UpdatedAt
567567
}
568568

569+
mergeCommitSHA := pr.MergeCommitSHA
570+
if mergeCommitSHA == "" {
571+
mergeCommitSHA = pr.SquashCommitSHA
572+
}
573+
569574
var locked bool
570575
if pr.State == "locked" {
571576
locked = true
@@ -608,7 +613,7 @@ func (g *GitlabDownloader) GetPullRequests(page, perPage int) ([]*base.PullReque
608613
Closed: closeTime,
609614
Labels: labels,
610615
Merged: merged,
611-
MergeCommitSHA: pr.MergeCommitSHA,
616+
MergeCommitSHA: mergeCommitSHA,
612617
MergedTime: mergeTime,
613618
IsLocked: locked,
614619
Reactions: g.awardsToReactions(reactions),

0 commit comments

Comments
 (0)