We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 0f653bf commit 5f3a3d0Copy full SHA for 5f3a3d0
1 file changed
git-cliff-core/src/remote/gitlab.rs
@@ -170,7 +170,10 @@ impl RemotePullRequest for GitLabMergeRequest {
170
}
171
172
fn merge_commit(&self) -> Option<String> {
173
- self.merge_commit_sha.clone().or(Some(self.sha.clone()))
+ self.merge_commit_sha
174
+ .clone()
175
+ .or(self.squash_commit_sha.clone())
176
+ .or(Some(self.sha.clone()))
177
178
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
+ }
336
0 commit comments