Skip to content

Commit 5f3a3d0

Browse files
fix(remote): fix detection of GitLab merge request sha if commits were squashed (#1043)
1 parent 0f653bf commit 5f3a3d0

1 file changed

Lines changed: 15 additions & 1 deletion

File tree

git-cliff-core/src/remote/gitlab.rs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,10 @@ impl RemotePullRequest for GitLabMergeRequest {
170170
}
171171

172172
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()))
174177
}
175178
}
176179

@@ -319,4 +322,15 @@ mod test {
319322
};
320323
assert!(mr.merge_commit().is_some());
321324
}
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+
}
322336
}

0 commit comments

Comments
 (0)