bookworm/bookworm-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 更新Bookworm.bat git pull 前 stash 本地修改

Browse Source 
settings.json 由 template 渲染后与仓库版本不同,
导致 git pull --rebase 报 unstaged changes 失败。
pull 前 stash、pull 后 pop 恢复。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
bookworm 2026-04-27 22:19:32 +08:00
parent 47079cb8b1
commit 57ca443386
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
更新Bookworm.bat
View File

@ -22,11 +22,13 @@ if %errorlevel% neq 0 (
:: 同步 ~/.claude 配置仓库 (Skill/hook/agents) :: 同步 ~/.claude 配置仓库 (Skill/hook/agents)
echo. echo.
echo [2/2] 同步 Claude 配置 (.claude/)... echo [2/2] 同步 Claude 配置 (.claude/)...
git -C "%USERPROFILE%\.claude" stash -q 2>nul
git -C "%USERPROFILE%\.claude" pull --rebase 2>&1 git -C "%USERPROFILE%\.claude" pull --rebase 2>&1
if %errorlevel% neq 0 ( if %errorlevel% neq 0 (
echo [!] .claude git pull 失败 ^(不影响启动 lnk^) echo [!] .claude git pull 失败 ^(不影响启动 lnk^)
set HAS_FAIL=1 set HAS_FAIL=1
) )
git -C "%USERPROFILE%\.claude" stash pop -q 2>nul
echo. echo.
echo ============================================ echo ============================================