Fix visitor counter PR push workflow

Author: Timna Brown

.github/workflows/use-visitor-counter.yml

@@ -44,24 +44,50 @@ jobs:
         env:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          git fetch origin
-          git checkout ${{ github.head_ref }}
-          git pull origin ${{ github.head_ref }} || echo "No merge needed"
-          git add -A
-          git commit -m "Update visitor count" || echo "No changes to commit"
+          BRANCH="${{ github.head_ref }}"
           git remote set-url origin https://x-access-token:${TOKEN}@github.com/${{ github.repository }}
-          git push origin HEAD:${{ github.head_ref }}
+          HAS_CHANGES=false
+          if ! git diff --quiet || ! git diff --cached --quiet || [ -n "$(git ls-files --others --exclude-standard)" ]; then
+            HAS_CHANGES=true
+            git stash push --include-untracked --message visitor-counter
+          fi
+          git fetch origin "$BRANCH"
+          git checkout -B "$BRANCH" "origin/$BRANCH"
+          if [ "$HAS_CHANGES" = true ]; then
+            git stash pop
+          fi
+          git add -A
+          if git diff --cached --quiet; then
+            echo "No changes to commit"
+            exit 0
+          fi
+          git commit -m "Update visitor count"
+          git pull --rebase origin "$BRANCH"
+          git push origin HEAD:"$BRANCH"
 
       # Commit and push logic for non-PR events (merge, not rebase)
       - name: Commit and push changes (non-PR)
         if: github.event_name != 'pull_request'
         env:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          git fetch origin
-          git checkout ${{ github.ref_name }} || git checkout -b ${{ github.ref_name }} origin/${{ github.ref_name }}
-          git pull origin ${{ github.ref_name }} || echo "No merge needed"
-          git add -A
-          git commit -m "Update visitor count" || echo "No changes to commit"
+          BRANCH="${{ github.ref_name }}"
           git remote set-url origin https://x-access-token:${TOKEN}@github.com/${{ github.repository }}
-          git push origin HEAD:${{ github.ref_name }}
+          HAS_CHANGES=false
+          if ! git diff --quiet || ! git diff --cached --quiet || [ -n "$(git ls-files --others --exclude-standard)" ]; then
+            HAS_CHANGES=true
+            git stash push --include-untracked --message visitor-counter
+          fi
+          git fetch origin "$BRANCH"
+          git checkout -B "$BRANCH" "origin/$BRANCH"
+          if [ "$HAS_CHANGES" = true ]; then
+            git stash pop
+          fi
+          git add -A
+          if git diff --cached --quiet; then
+            echo "No changes to commit"
+            exit 0
+          fi
+          git commit -m "Update visitor count"
+          git pull --rebase origin "$BRANCH"
+          git push origin HEAD:"$BRANCH"