apricote/releaser-pleaser
1
0
Fork 0
mirror of https://github.com/apricote/releaser-pleaser.git synced 2026-01-13 21:21:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixup! fix(gitlab): support Fast-forward merge

Browse source
This commit is contained in:
Zadkiel AHARONIAN 2025-07-11 01:42:39 +02:00 • committed by GitHub
parent 4cb7dc0275
commit 09bf995d05
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
internal/forge/gitlab/gitlab.go
View file

@ -405,11 +405,12 @@ func gitlabMRToReleasePullRequest(pr *gitlab.BasicMergeRequest) *releasepr.Relea
// Commit SHA is saved in either [MergeCommitSHA], [SquashCommitSHA] or [SHA] depending on which merge method was used. // Commit SHA is saved in either [MergeCommitSHA], [SquashCommitSHA] or [SHA] depending on which merge method was used.
var releaseCommit *git.Commit var releaseCommit *git.Commit
if pr.MergeCommitSHA != "" { switch {
case pr.MergeCommitSHA != "":
releaseCommit = &git.Commit{Hash: pr.MergeCommitSHA} releaseCommit = &git.Commit{Hash: pr.MergeCommitSHA}
} else if pr.SquashCommitSHA != "" { case pr.SquashCommitSHA != "":
releaseCommit = &git.Commit{Hash: pr.SquashCommitSHA} releaseCommit = &git.Commit{Hash: pr.SquashCommitSHA}
} else if pr.MergedAt != nil && pr.SHA != "" { case pr.MergedAt != nil && pr.SHA != "":
releaseCommit = &git.Commit{Hash: pr.SHA} releaseCommit = &git.Commit{Hash: pr.SHA}
} }