From 79f1d41f366c46ccaad47e11d8b9ff46b21ef49a Mon Sep 17 00:00:00 2001
From: Cynopolis <quinn.henthorne@gmail.com>
Date: Wed, 21 May 2025 18:19:51 -0400
Subject: [PATCH] Fixing auto-checkout issues

---
 .gitea/workflows/Merge-Checker.yaml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/Merge-Checker.yaml b/.gitea/workflows/Merge-Checker.yaml
index 6df5ece..16c36e6 100644
--- a/.gitea/workflows/Merge-Checker.yaml
+++ b/.gitea/workflows/Merge-Checker.yaml
@@ -50,18 +50,34 @@ jobs:
             exit 1
           fi
       - name: Commit and push timing results
-        if: github.event.pull_request.head.repo.full_name == github.repository  # Only push from same repo
+        if: github.event.pull_request.head.repo.full_name == github.repository
         run: |
           git config --global user.name "ci-bot"
           git config --global user.email "ci-bot@local"
 
           BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
-          
+
+          echo "Checking if last commit was a timing update"
+          LAST_COMMIT_MSG=$(git log -1 --pretty=%B)
+
+          if echo "$LAST_COMMIT_MSG" | grep -q "Update matrix-timing-tests timings"; then
+            echo "Last commit was a timing update, skipping commit."
+            exit 0
+          else
+            echo "Last commit name was: {$LAST_COMMIT_MSG}"
+          fi
+
+          echo "Checking out source branch $BRANCH_NAME"
+          git stash
+          git fetch origin "$BRANCH_NAME"
+          git checkout -B "$BRANCH_NAME" "origin/$BRANCH_NAME"
+          git stash pop
+
           git add unit-tests/timing-results/matrix-timing-tests.txt
 
           if git diff --quiet --cached; then
             echo "No changes to commit"
           else
             git commit -m "Update matrix-timing-tests timings [skip ci]"
-            git push origin HEAD:$BRANCH_NAME
-          fi
\ No newline at end of file
+            git push origin "$BRANCH_NAME"
+          fi