From a3b5da62a86abd35a6c2f25169e0da608d2e1dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Bru=CC=88ckner?= <code@nik.dev>
Date: Sat, 28 Oct 2023 16:40:03 -0700
Subject: [PATCH] Use GitLab's squash_commit_sha when available

---
 services/migrations/gitlab.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/services/migrations/gitlab.go b/services/migrations/gitlab.go
index f626036254e9f..53540899a6036 100644
--- a/services/migrations/gitlab.go
+++ b/services/migrations/gitlab.go
@@ -566,6 +566,11 @@ func (g *GitlabDownloader) GetPullRequests(page, perPage int) ([]*base.PullReque
 			closeTime = pr.UpdatedAt
 		}
 
+		mergeCommitSHA := pr.MergeCommitSHA
+		if mergeCommitSHA == "" {
+			mergeCommitSHA = pr.SquashCommitSHA
+		}
+
 		var locked bool
 		if pr.State == "locked" {
 			locked = true
@@ -608,7 +613,7 @@ func (g *GitlabDownloader) GetPullRequests(page, perPage int) ([]*base.PullReque
 			Closed:         closeTime,
 			Labels:         labels,
 			Merged:         merged,
-			MergeCommitSHA: pr.MergeCommitSHA,
+			MergeCommitSHA: mergeCommitSHA,
 			MergedTime:     mergeTime,
 			IsLocked:       locked,
 			Reactions:      g.awardsToReactions(reactions),