From fc93bcbd6fe9a070a1591f771cc121a4bc8d9488 Mon Sep 17 00:00:00 2001
From: Dean Sheather <dean@deansheather.com>
Date: Wed, 3 Dec 2025 01:51:36 +0000
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=96=20fix:=20preserve=20existing?=
 =?UTF-8?q?=20GIT=5FSSH=5FCOMMAND=20when=20set?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of overwriting GIT_SSH_COMMAND entirely, append SSH options
to the existing value. Falls back to 'ssh' if not set.

_Generated with mux_
---
 scripts/bump_tag.sh               | 4 ++--
 src/common/utils/git/gitStatus.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bump_tag.sh b/scripts/bump_tag.sh
index 069cf9fddd..db16e557a0 100755
--- a/scripts/bump_tag.sh
+++ b/scripts/bump_tag.sh
@@ -18,7 +18,7 @@ if [[ -z "$CURRENT_VERSION" || "$CURRENT_VERSION" == "null" ]]; then
 fi
 
 # Parse semver components
-IFS='.' read -r MAJOR MINOR_V PATCH <<< "$CURRENT_VERSION"
+IFS='.' read -r MAJOR MINOR_V PATCH <<<"$CURRENT_VERSION"
 
 # Calculate new version
 if [[ "$MINOR" == "true" ]]; then
@@ -30,7 +30,7 @@ fi
 echo "Bumping version: $CURRENT_VERSION -> $NEW_VERSION"
 
 # Update package.json
-jq --arg v "$NEW_VERSION" '.version = $v' package.json > package.json.tmp
+jq --arg v "$NEW_VERSION" '.version = $v' package.json >package.json.tmp
 mv package.json.tmp package.json
 
 # Commit and tag
diff --git a/src/common/utils/git/gitStatus.ts b/src/common/utils/git/gitStatus.ts
index 74ad93897c..e6650c71f6 100644
--- a/src/common/utils/git/gitStatus.ts
+++ b/src/common/utils/git/gitStatus.ts
@@ -92,7 +92,7 @@ export const GIT_FETCH_SCRIPT = `
 export GIT_TERMINAL_PROMPT=0
 export GIT_ASKPASS=echo
 export SSH_ASKPASS=echo
-export GIT_SSH_COMMAND="ssh -o BatchMode=yes -o StrictHostKeyChecking=accept-new"
+export GIT_SSH_COMMAND="\${GIT_SSH_COMMAND:-ssh} -o BatchMode=yes -o StrictHostKeyChecking=accept-new"
 
 # Fast fetch with optimization flags
 git -c protocol.version=2 \\

From f7e012d9d29b189fa3a7b903b27df72f4b60212b Mon Sep 17 00:00:00 2001
From: Dean Sheather <dean@deansheather.com>
Date: Wed, 3 Dec 2025 02:32:03 +0000
Subject: [PATCH 2/2] ci: retrigger checks