try with branch name

dfinity · Oct 3, 2024 · 89e058b · 89e058b
1 parent a02d994
commit 89e058b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/ci/bazel-scripts/diff.sh b/ci/bazel-scripts/diff.sh
@@ -14,7 +14,8 @@ set -x
 cd "$(git rev-parse --show-toplevel)"
 
 MERGE_BASE="${MERGE_BASE_SHA:-HEAD}"
-CURRENT_BRANCH_HEAD_SHA=$(git rev-parse HEAD)
+# we can't use CI_COMMIT_SHA here because that is the merge commit which contains more changes
+CURRENT_BRANCH_HEAD_SHA=$(git rev-parse origin/"$BRANCH_NAME")
 COMMIT_RANGE=${COMMIT_RANGE:-$MERGE_BASE".."$CURRENT_BRANCH_HEAD_SHA}
 DIFF_FILES=$(git diff --name-only "${COMMIT_RANGE}")