From 38f959687665f05914bfd8547e3aab43956ff11d Mon Sep 17 00:00:00 2001
From: Norman Stetter <norman.stetter@garz-fricke.com>
Date: Thu, 25 Mar 2021 15:48:39 +0100
Subject: [PATCH] Take squashed MRs into account
When a MR is merged via WebUI using the 'squash commits' option the
squashed commit is assigned to the 'squash_commit_sha' property of the
MR object. We have to test for this property too, when looking which MR
a commit belongs to in case the pipeline runs on a squashed commit.
Otherwise parent MR cannot be found.
---
get_merge_requests.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/get_merge_requests.py b/get_merge_requests.py
index f0b7cdd7..8846d5af 100755
--- a/get_merge_requests.py
+++ b/get_merge_requests.py
@@ -26,7 +26,7 @@ def get_merge_requests(
)
if commit:
for mr in all_merge_requests:
- if mr.sha == commit:
+ if mr.sha == commit or mr.squash_commit_sha == commit:
merge_requests.append(mr)
elif all_merge_requests:
merge_requests = all_merge_requests
--
GitLab