From 3510474764514b3b57c78993d50b9bf0bb177d16 Mon Sep 17 00:00:00 2001
From: tracer <tracer@24unix.net>
Date: Sun, 19 Apr 2026 12:07:08 +0200
Subject: [PATCH] fix: stop nested push in release hook

---
 hooks/pre-push | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/hooks/pre-push b/hooks/pre-push
index d6523b2..ad57e36 100755
--- a/hooks/pre-push
+++ b/hooks/pre-push
@@ -67,7 +67,8 @@ fi
 git -C "$ROOT_DIR" add "$ROOT_DIR/version.json" "$ROOT_DIR/iKeyMon.xcodeproj/project.pbxproj" "$ROOT_DIR/Sparkle/appcast.xml"
 
 if git -C "$ROOT_DIR" diff --cached --quiet; then
-  echo "release: no changes detected; skipping commit"
+  echo "release: no changes detected; continuing push"
+  exit 0
 else
   run_logged git -C "$ROOT_DIR" commit -m "chore: release ${NEW_VERSION}" || {
     echo "release: commit failed (log: $RELEASE_LOG)"
@@ -75,10 +76,5 @@ else
   }
 fi
 
-if SKIP_RELEASE=1 git -C "$ROOT_DIR" push --quiet "$REMOTE_NAME" "${release_local_ref:-refs/heads/master}:${release_remote_ref:-refs/heads/master}"; then
-  echo "release: success v${NEW_VERSION} (release commit already pushed; stopping original push)"
-  exit 1
-else
-  echo "release: push failed (log: $RELEASE_LOG)"
-  exit 1
-fi
+echo "release: created commit for v${NEW_VERSION}; run 'git push' again to push the new release commit"
+exit 1