From d8559bef3f96c23950a438dac2ab734a7e947602 Mon Sep 17 00:00:00 2001 From: Daniil Kachalov Date: Mon, 17 Aug 2026 09:55:59 +0300 Subject: [PATCH] fix gitleaks diff range Signed-off-by: Daniil Kachalov --- gitleaks/action.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gitleaks/action.yml b/gitleaks/action.yml index f26fe2c..407c9df 100644 --- a/gitleaks/action.yml +++ b/gitleaks/action.yml @@ -113,8 +113,15 @@ runs: set -euo pipefail CONFIG_ARG="${{ steps.config.outputs.config_arg }}" - BASE_COMMIT=$(git rev-parse HEAD^1) - echo "Base commit: $BASE_COMMIT" + BASE_REF="${{ github.event.pull_request.base.ref }}" + BASE_REMOTE_REF="refs/remotes/origin/${BASE_REF}" + + git fetch --no-tags --prune origin "+refs/heads/${BASE_REF}:${BASE_REMOTE_REF}" + BASE_COMMIT=$(git merge-base HEAD "$BASE_REMOTE_REF") + + echo "PR base branch: ${BASE_REF}" + echo "PR base ref: ${BASE_REMOTE_REF}" + echo "Merge-base commit: ${BASE_COMMIT}" echo "Scanning range: ${BASE_COMMIT}..HEAD" gitleaks detect --no-banner --redact --log-level debug \