From 192bd5af45899be2aa3587c2dce1ac91c21e5591 Mon Sep 17 00:00:00 2001
From: Thomas Watson <watson@elastic.co>
Date: Tue, 26 Sep 2023 12:38:23 +0200
Subject: [PATCH] [Ops] Fix scoped type check (#167229)

---
 .buildkite/scripts/steps/check_types_commits.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 .buildkite/scripts/steps/check_types_commits.sh

diff --git a/.buildkite/scripts/steps/check_types_commits.sh b/.buildkite/scripts/steps/check_types_commits.sh
old mode 100644
new mode 100755
index 0b76d3d8e089a..113f516efc023
--- a/.buildkite/scripts/steps/check_types_commits.sh
+++ b/.buildkite/scripts/steps/check_types_commits.sh
@@ -5,8 +5,8 @@ set -euo pipefail
 
 if [[ "${CI-}" == "true" ]]; then
   .buildkite/scripts/bootstrap.sh
-  
-  sha1="${GITHUB_PR_TARGET_BRANCH-}"
+
+  sha1=$(git merge-base $GITHUB_PR_TARGET_BRANCH $GITHUB_PR_TRIGGERED_SHA)
   sha2="${GITHUB_PR_TRIGGERED_SHA-}"
 else
   # Script take between 0 and 2 arguments representing two commit SHA's: