From e822ab7ae12bd225d6ccd3c4968c2e368fc29d99 Mon Sep 17 00:00:00 2001
From: rcourtman <courtmanr@gmail.com>
Date: Thu, 13 Nov 2025 11:43:36 +0000
Subject: [PATCH] Fix remote sync check in release trigger script

- Replace unreliable git fetch --dry-run check
- Use git rev-parse to compare local and remote commits
- Prevents false warnings about diverged branches
---
 scripts/trigger-release.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/trigger-release.sh b/scripts/trigger-release.sh
index 44fb02ac8..30f64a4ff 100755
--- a/scripts/trigger-release.sh
+++ b/scripts/trigger-release.sh
@@ -61,8 +61,13 @@ else
 fi
 
 # Check 4: Up to date with remote
-if ! git fetch origin --dry-run 2>&1 | grep -q "up to date"; then
-  echo "⚠️  Warning: Remote has updates or local branch is ahead"
+git fetch origin --quiet
+LOCAL=$(git rev-parse @)
+REMOTE=$(git rev-parse @{u})
+
+if [ "$LOCAL" != "$REMOTE" ]; then
+  echo "⚠️  Warning: Local and remote branches have diverged"
+  git status -sb
   echo ""
   read -p "Continue anyway? [y/N] " -n 1 -r
   echo ""