fix(remote): fix detection of GitLab merge request sha if commits were squashed (#1043)

hackenbergstefan · web-flow · commit 5f3a3d0b4dba · 2025-02-19T18:16:05.000+03:00
diff --git a/git-cliff-core/src/remote/gitlab.rs b/git-cliff-core/src/remote/gitlab.rs
@@ -170,7 +170,10 @@ impl RemotePullRequest for GitLabMergeRequest {
 	}
 
 	fn merge_commit(&self) -> Option<String> {
-		self.merge_commit_sha.clone().or(Some(self.sha.clone()))
+		self.merge_commit_sha
+			.clone()
+			.or(self.squash_commit_sha.clone())
+			.or(Some(self.sha.clone()))
 	}
 }
 
@@ -319,4 +322,15 @@ mod test {
 		};
 		assert!(mr.merge_commit().is_some());
 	}
+
+	#[test]
+	fn merge_request_squash_commit() {
+		let mr = GitLabMergeRequest {
+			squash_commit_sha: Some(String::from(
+				"1d244937ee6ceb8e0314a4a201ba93a7a61f2071",
+			)),
+			..Default::default()
+		};
+		assert!(mr.merge_commit().is_some());
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,10 @@ impl RemotePullRequest for GitLabMergeRequest {`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`fn merge_commit(&self) -> Option<String> {`
`173`		`- self.merge_commit_sha.clone().or(Some(self.sha.clone()))`
	`173`	`+ self.merge_commit_sha`
	`174`	`+ .clone()`
	`175`	`+ .or(self.squash_commit_sha.clone())`
	`176`	`+ .or(Some(self.sha.clone()))`
`174`	`177`	`}`
`175`	`178`	`}`
`176`	`179`
`@@ -319,4 +322,15 @@ mod test {`
`319`	`322`	`};`
`320`	`323`	`assert!(mr.merge_commit().is_some());`
`321`	`324`	`}`
	`325`	`+`
	`326`	`+ #[test]`
	`327`	`+ fn merge_request_squash_commit() {`
	`328`	`+ let mr = GitLabMergeRequest {`
	`329`	`+ squash_commit_sha: Some(String::from(`
	`330`	`+ "1d244937ee6ceb8e0314a4a201ba93a7a61f2071",`
	`331`	`+ )),`
	`332`	`+ ..Default::default()`
	`333`	`+ };`
	`334`	`+ assert!(mr.merge_commit().is_some());`
	`335`	`+ }`
`322`	`336`	`}`