From 7593c6cde33df08daaa5ef338323ea6752ecd385 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 20 Jul 2026 14:16:48 +0800 Subject: [PATCH] =?UTF-8?q?fix(ci):=20auto-fix=20checkout=E5=8A=A0--force?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8Dtarball=20untracked=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/ci/auto_fix_formatting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/auto_fix_formatting.py b/scripts/ci/auto_fix_formatting.py index 76b77fdab..ad5252819 100755 --- a/scripts/ci/auto_fix_formatting.py +++ b/scripts/ci/auto_fix_formatting.py @@ -62,7 +62,7 @@ def ensure_git_repo(api_url, repo, token, pr_number): # 强制checkout到源分支（覆盖tarball内容） # tarball是merge后的commit，源分支才是我们要修改并推送的目标 print("切换到源分支...") - run(f"git checkout -B {head_branch} FETCH_HEAD") + run(f"git checkout -B --force {head_branch} FETCH_HEAD") result = run("git status --porcelain") if result.stdout.strip(): -- 2.54.0