Skip to content

Commit fc93bcb

Browse files
committed
🤖 fix: preserve existing GIT_SSH_COMMAND when set
Instead of overwriting GIT_SSH_COMMAND entirely, append SSH options to the existing value. Falls back to 'ssh' if not set. _Generated with mux_
1 parent 76d8779 commit fc93bcb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

scripts/bump_tag.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if [[ -z "$CURRENT_VERSION" || "$CURRENT_VERSION" == "null" ]]; then
1818
fi
1919

2020
# Parse semver components
21-
IFS='.' read -r MAJOR MINOR_V PATCH <<< "$CURRENT_VERSION"
21+
IFS='.' read -r MAJOR MINOR_V PATCH <<<"$CURRENT_VERSION"
2222

2323
# Calculate new version
2424
if [[ "$MINOR" == "true" ]]; then
@@ -30,7 +30,7 @@ fi
3030
echo "Bumping version: $CURRENT_VERSION -> $NEW_VERSION"
3131

3232
# Update package.json
33-
jq --arg v "$NEW_VERSION" '.version = $v' package.json > package.json.tmp
33+
jq --arg v "$NEW_VERSION" '.version = $v' package.json >package.json.tmp
3434
mv package.json.tmp package.json
3535

3636
# Commit and tag

src/common/utils/git/gitStatus.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export const GIT_FETCH_SCRIPT = `
9292
export GIT_TERMINAL_PROMPT=0
9393
export GIT_ASKPASS=echo
9494
export SSH_ASKPASS=echo
95-
export GIT_SSH_COMMAND="ssh -o BatchMode=yes -o StrictHostKeyChecking=accept-new"
95+
export GIT_SSH_COMMAND="\${GIT_SSH_COMMAND:-ssh} -o BatchMode=yes -o StrictHostKeyChecking=accept-new"
9696
9797
# Fast fetch with optimization flags
9898
git -c protocol.version=2 \\

0 commit comments

Comments
 (0)