From 750a9868217044da496eecd45883789cfbd82523 Mon Sep 17 00:00:00 2001
From: gouki <gouki.xiao@gmail.com>
Date: Sun, 9 Aug 2026 21:53:05 +0000
Subject: [PATCH] =?UTF-8?q?fix(deploy):=20update.sh=E6=94=B9=E7=94=A8reset?=
 =?UTF-8?q?=20--hard=E5=90=8C=E6=AD=A5=E8=BF=9C=E7=AB=AF=EF=BC=8C=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E8=AF=AF=E6=94=B9=E4=B8=8D=E5=86=8D=E9=98=BB=E5=A1=9E?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/update.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/deploy/update.sh b/deploy/update.sh
index ab56fea..e023125 100755
--- a/deploy/update.sh
+++ b/deploy/update.sh
@@ -66,7 +66,9 @@ if [ "$LOCAL" = "$REMOTE" ]; then
 fi
 
 echo "[$(date '+%F %T')] 检测到新版本: ${LOCAL:0:8} -> ${REMOTE:0:8}"
-git pull --ff-only -q origin "$BRANCH"
+# 部署节点始终与远端完全一致：reset --hard 丢弃任何本地变更（含文件 mode 变化），
+# 避免 cc1 上误改文件导致 pull 拒绝合并、更新链路卡死
+git reset --hard -q "origin/$BRANCH"
 
 # 依赖如有变更自动安装（无变化时 pip 会快速跳过）
 if [ -x ".venv/bin/pip" ]; then