From 6cca93bcfaca88447ac02ad98e927b3e7b39c352 Mon Sep 17 00:00:00 2001
From: luk <luk@tic.cc>
Date: Tue, 1 Sep 2026 09:13:20 +0800
Subject: [PATCH] u

---
 git_config.sh | 14 +++++++-------
 ssh.sh        |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/git_config.sh b/git_config.sh
index ba3b458..2bb7883 100755
--- a/git_config.sh
+++ b/git_config.sh
@@ -10,7 +10,7 @@ then
 fi
 
 echo "---------------------------------------------"
-echo "User Email (leave blank for unchanged $(git config --get user.email))" 
+echo "User Email (leave blank for unchanged \"$(git config --get user.email))\"" 
 read -p "***:: " UserEmail
 if [ $UserEmail ]
 then
@@ -20,7 +20,7 @@ fi
 
 echo "---------------------------------------------"
 echo "如果 git 远程服务器的 ssl 证书过期，或者使用了自颁发的证书，连接时会出现验证错误 Cannot verify local issuer"
-echo "Verify ssl? (true, false, or leave blank for unchanged $(git config --get http.sslVerify))" 
+echo "Verify ssl? (true, false, or leave blank for unchanged \"$(git config --get http.sslVerify))\"" 
 read -p "***:: " HttpSslVerify
 if [ $HttpSslVerify ]
 then
@@ -29,7 +29,7 @@ then
 fi
 
 echo "---------------------------------------------"
-echo "Store credential in [cache] or [store]? (leave blank for unchanged $(git config --get credential.helper))" 
+echo "Store credential in [cache] or [store]? (leave blank for unchanged \"$(git config --get credential.helper))\"" 
 read -p "***:: " CredentialHelper
 if [ $CredentialHelper ]
 then
@@ -38,7 +38,7 @@ then
 fi
 
 echo "---------------------------------------------"
-echo "Store pull rebase to [true] or [false]? (leave blank for unchanged $(git config --get pull.rebase))" 
+echo "Store pull rebase to [true] or [false]? (leave blank for unchanged \"$(git config --get pull.rebase))\"" 
 read -p "***:: " PullRebase
 if [ $PullRebase ]
 then
@@ -47,7 +47,7 @@ then
 fi
 
 echo "---------------------------------------------"
-echo "Set [path to global gitignore file] or leave blank for unchanged $(git config --get core.excludesfile)"
+echo "Set [path to global gitignore file] or leave blank for unchanged \"$(git config --get core.excludesfile)\""
 read -p "***:: " ExcludesFile
 if [ $ExcludesFile ]
 then
@@ -58,7 +58,7 @@ else
 fi
 
 echo "---------------------------------------------"
-echo "Set default branch since git 2.28 to master or main? (leave blank for unchanged $(git config --get init.defaultbranch))"
+echo "Set default branch since git 2.28 to master or main? (leave blank for unchanged \"$(git config --get init.defaultbranch))\""
 read -p "***:: " DefaultBranch
 if [ $DefaultBranch ]
 then
@@ -67,7 +67,7 @@ then
 fi
 
 echo "---------------------------------------------"
-echo "Set postBuffer size? Suggesting 157286400 (leave blank for unchanged $(git config --get http.postBuffer))"
+echo "Set postBuffer size? Suggesting 157286400 (leave blank for unchanged \"$(git config --get http.postBuffer))\""
 read -p "***:: " PostBufferSize
 if [ $PostBufferSize ]
 then
diff --git a/ssh.sh b/ssh.sh
index 7b1eb2d..5c0803f 100755
--- a/ssh.sh
+++ b/ssh.sh
@@ -81,12 +81,12 @@ if [ "$port" = "null" ]; then
     port=22
 fi
 
-# 未提供 $2 时，默认在远程执行：若装有 tmux 则 tmux a（附加到已有会话），否则进入交互式 shell。
-# 此时必须加 -t 强制分配伪终端，否则 tmux 报 "open terminal failed: not a terminal"，回退 shell 也不显示提示符
 if [ -n "$2" ]; then
     cmd="$2"
-    ssh_opts="-Y"
+    ssh_opts="-Y -t" # 如果 $2=tmux 那么也需要 -t
 else
+    # 未提供 $2 时，默认在远程执行：若装有 tmux 则 tmux a（附加到已有会话），否则进入交互式 shell。
+    # 此时必须加 -t 强制分配伪终端，否则 tmux 报 "open terminal failed: not a terminal"，回退 shell 也不显示提示符
     cmd='if command -v tmux >/dev/null 2>&1; then tmux new -A; else exec "${SHELL:-sh}"; fi'
     ssh_opts="-Y -t"
 fi