From 10c17ddff338252868caa418ec554aaf2edde347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A1=E8=8B=A5?= <karuo@MacBook-Pro.local>
Date: Thu, 12 Mar 2026 15:56:58 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=84=20=E5=90=8C=E6=AD=A5=202026-03-12?=
 =?UTF-8?q?=2015:56=20|=20=E4=B8=80=E5=9C=BAsoul=E7=9A=84=E5=88=9B?=
 =?UTF-8?q?=E4=B8=9A=E5=AE=9E=E9=AA=8C=EF=BC=88=E4=B9=A6=E7=A8=BF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/gitea_sync.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/gitea_sync.sh b/scripts/gitea_sync.sh
index f3ff800..d75f602 100755
--- a/scripts/gitea_sync.sh
+++ b/scripts/gitea_sync.sh
@@ -11,6 +11,8 @@ REPO_DIR="${1:-$(cd "$(dirname "$0")/.." && pwd)}"
 BRANCH="main"
 REMOTE_GITEA="gitea"
 REMOTE_ORIGIN="origin"
+# 默认只同步 gitea；如需同时同步 GitHub，显式设置：export SYNC_WITH_GITHUB=1
+SYNC_WITH_GITHUB="${SYNC_WITH_GITHUB:-0}"
 
 cd "$REPO_DIR" || exit 1
 
@@ -64,9 +66,11 @@ commit_if_needed() {
 # 1) 先把本地新增/删除提交掉，保证 pull 时可 rebase/ff
 commit_if_needed
 
-# 2) 再拉取远端新增（GitHub / Gitea 任一端有新提交都能合进来）
-ff_merge_remote_branch "$REMOTE_ORIGIN"
+# 2) 再拉取远端新增（默认只拉 Gitea；避免与 GitHub 分叉时阻塞同步）
 ff_merge_remote_branch "$REMOTE_GITEA"
+if [ "$SYNC_WITH_GITHUB" = "1" ]; then
+  ff_merge_remote_branch "$REMOTE_ORIGIN"
+fi
 
 # 3) 拉完后如果又产生本地变更（例如 merge 带来的更新），再补一次提交（一般不会）
 commit_if_needed
@@ -80,7 +84,7 @@ else
   exit 1
 fi
 
-if has_remote "$REMOTE_ORIGIN"; then
+if [ "$SYNC_WITH_GITHUB" = "1" ] && has_remote "$REMOTE_ORIGIN"; then
   git push "$REMOTE_ORIGIN" "$BRANCH" >/dev/null 2>&1 && \
     echo "[gitea_sync] ✅ 已推送到 GitHub（origin）"
 fi