From 627ad8c6f2f3974c576e6ac3d9340fba5923e5b9 Mon Sep 17 00:00:00 2001
From: Gregory Oschwald <goschwald@maxmind.com>
Date: Tue, 25 Nov 2025 13:33:39 -0800
Subject: [PATCH] Add branch validation checks to release script

---
 dev-bin/release.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dev-bin/release.sh b/dev-bin/release.sh
index e1b203e5..32630259 100755
--- a/dev-bin/release.sh
+++ b/dev-bin/release.sh
@@ -10,6 +10,16 @@ if [ "$current_branch" = "main" ]; then
     exit 1
 fi
 
+# Fetch latest changes and check that we're not behind origin/main
+echo "Fetching from origin..."
+git fetch origin
+
+if ! git merge-base --is-ancestor origin/main HEAD; then
+    echo "Error: Current branch is behind origin/main."
+    echo "Please merge or rebase with origin/main before releasing."
+    exit 1
+fi
+
 changelog=$(cat CHANGELOG.md)
 
 regex='