From 762915ab71299c6be664c2d4d7a47692a5be5f30 Mon Sep 17 00:00:00 2001
From: SuperJacky6 <adding2003@gmail.com>
Date: Sat, 8 Aug 2026 17:29:32 +0800
Subject: [PATCH] v7

---
 .gitea/workflows/deploy-on-merge.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/deploy-on-merge.yml b/.gitea/workflows/deploy-on-merge.yml
index d578065..21eb0d8 100644
--- a/.gitea/workflows/deploy-on-merge.yml
+++ b/.gitea/workflows/deploy-on-merge.yml
@@ -21,8 +21,8 @@ jobs:
           ssh -i ~/.ssh/deploy_key ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }} <<-'EOF'
             set -e
             cd $DEPLOY_PATH
-            # 移除--add，兼容老git版本
-            git config --global safe.directory "$DEPLOY_PATH"
+            # 使用--local，仅当前仓库生效，不修改全局git配置，避开safe.directory多值冲突
+            git config --local safe.directory "*"
             git fetch origin main
 
             # 备份运行时db