From 5d2c6c50e8b38e069516c4328c7ef3e7f6723382 Mon Sep 17 00:00:00 2001
From: "douboer@gmail.com" <gavin@gavinm4.local>
Date: Sun, 26 Jul 2026 10:44:35 +0800
Subject: [PATCH] update at 2026-07-26 10:44:35

---
 deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy.sh b/deploy.sh
index c613f61..a7e2eee 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -78,7 +78,7 @@ push_source() {
 
 prepare_remote_code() {
   log_step '4/8 检查 myweb 并同步代码'
-  ssh_web "bash -lc 'set -e; command -v git python3 node npm curl >/dev/null; test -d \"$REMOTE_WORKDIR/.git\"; cd \"$REMOTE_WORKDIR\"; git fetch origin \"$DEPLOY_BRANCH\"; git checkout \"$DEPLOY_BRANCH\"; git pull --ff-only origin \"$DEPLOY_BRANCH\"; git log -1 --oneline'"
+  ssh_web "bash -lc 'set -e; command -v git python3 node npm curl >/dev/null; test -d \"$REMOTE_WORKDIR/.git\"; cd \"$REMOTE_WORKDIR\"; if ! git diff --quiet || ! git diff --cached --quiet; then git stash push --include-untracked -m \"deploy auto-backup $(date +%Y%m%d-%H%M%S)\"; echo \"已将远端本地改动备份至 git stash\"; fi; git fetch origin \"$DEPLOY_BRANCH\"; git checkout \"$DEPLOY_BRANCH\"; git pull --ff-only origin \"$DEPLOY_BRANCH\"; git log -1 --oneline'"
   log_ok 'myweb 代码已同步'
 }