Update test_harness.jl

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2026-02-12 11:06:54 +08:00 · 2025-11-23 10:24:12 -05:00 · 2025-11-23 10:24:12 -05:00 · 2025-11-23 10:24:12 -05:00 · 2025-11-23 10:24:12 -05:00 · 2025-11-23 10:24:12 -05:00
1 changed files with 10 additions and 2 deletions
--- a/test_harness.jl
+++ b/test_harness.jl
@@ -25,8 +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)
-        # success() returns true if the command exits with 0 (no differences)
-        has_diff = !success(`git diff --quiet --exit-code HEAD^2 HEAD`)
+        # 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^\{tree\}`, String))
+            pr_tree = chomp(read(`git rev-parse HEAD^2^\{tree\}`, 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'"
Author	SHA1	Message	Date
Ian Butterworth	d60b785c6f	Update test_harness.jl	2025-11-23 10:24:12 -05:00
Ian Butterworth	80da54fb1f	Update test_harness.jl Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-11-23 10:24:12 -05:00
Ian Butterworth	2e39f09cda	Revert "revertme: disable buildpkg" This reverts commit `fc4beef44a`.	2025-11-23 10:24:12 -05:00
Ian Butterworth	4106f361b2	revertme: disable buildpkg	2025-11-23 10:24:12 -05:00
Ian Butterworth	1cc5cea014	fix	2025-11-23 10:24:12 -05:00
Ian Butterworth	8b0e8344b9	fix	2025-11-23 10:24:12 -05:00
Ian Butterworth	639d29024e	fix	2025-11-23 10:24:12 -05:00
Ian Butterworth	ee4584ffbd	Compare tree hashes instead of using git diff Comparing tree hashes is more accurate for detecting content differences between the merge commit and PR head, avoiding false positives when the content is identical but commit SHAs differ.	2025-11-23 10:24:12 -05:00