From 1cc5cea0145125c1d8f31b7d102fddcf55709779 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Sun, 16 Nov 2025 21:08:28 -0500 Subject: [PATCH] fix --- test_harness.jl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/test_harness.jl b/test_harness.jl index 8bd9a85..cda090c 100644 --- a/test_harness.jl +++ b/test_harness.jl @@ -25,10 +25,16 @@ if haskey(ENV, "GITHUB_SHA") && get(ENV, "GITHUB_EVENT_NAME", "") == "pull_reque # Check if there's any difference between the merge commit and the PR head # In GitHub Actions, HEAD^2 is the PR head (second parent of merge commit) - # Compare tree hashes to check if content actually differs - merge_tree = chomp(read(`git rev-parse HEAD:`, String)) - pr_tree = chomp(read(`git rev-parse HEAD^2:`, String)) - has_diff = merge_tree != pr_tree + # First check if HEAD^2 exists (i.e., this is actually a merge commit) + if success(`git rev-parse --verify --quiet HEAD^2`) + # Compare tree hashes to check if content actually differs + merge_tree = chomp(read(`git rev-parse HEAD:`, String)) + pr_tree = chomp(read(`git rev-parse HEAD^2:`, String)) + has_diff = merge_tree != pr_tree + else + # Not a merge commit, so no difference to report + has_diff = false + end if has_diff base_branch = isempty(base_branch_name) ? "the base branch" : "'$base_branch_name'"