Closed railzy closed 3 years ago
should skip git stash and pop in the first installation or ignore error of git stash or pop
Log
+----------------------------------------------------------+ | Show deploy config | +----------------------------------------------------------+ Repository: https://github.com/LmeSzinc/AzurLaneAutoScript Brunch: app GitExecutable: ./toolkit/Git/mingw64/bin/git.exe GitProxy: <hidden> AutoUpdate: true KeepLocalChanges: true PythonExecutable: ./toolkit/python.exe PypiMirror: null InstallDependencies: true AdbExecutable: ./toolkit/Lib/site-packages/adbutils/binaries/adb.exe ReplaceAdb: true AutoConnect: true InstallUiautomator2: true WebuiPort: 22267 +---------------------------------------------------+ | Update Alas | +---------------------------------------------------+ ==================== Git Init ==================== "D:/games/AzurLane/alas_app/AzurLaneAutoScript/toolkit/Git/mingw64/bin/git.exe" init Reinitialized existing Git repository in D:/games/AzurLane/alas_app/AzurLaneAutoScript/.git/ ✓ success ==================== Set Git Proxy ==================== "D:/games/AzurLane/alas_app/AzurLaneAutoScript/toolkit/Git/mingw64/bin/git.exe" config --local http.proxy <hidden> ✓ success "D:/games/AzurLane/alas_app/AzurLaneAutoScript/toolkit/Git/mingw64/bin/git.exe" config --local https.proxy <hidden> ✓ success ==================== Set Git Repository ==================== "D:/games/AzurLane/alas_app/AzurLaneAutoScript/toolkit/Git/mingw64/bin/git.exe" remote set-url origin https://github.com/LmeSzinc/AzurLaneAutoScript ✓ success ==================== Fetch Repository Brunch ==================== "D:/games/AzurLane/alas_app/AzurLaneAutoScript/toolkit/Git/mingw64/bin/git.exe" fetch origin app From https://github.com/LmeSzinc/AzurLaneAutoScript * branch app -> FETCH_HEAD ✓ success ==================== Pull Repository Brunch ==================== "D:/games/AzurLane/alas_app/AzurLaneAutoScript/toolkit/Git/mingw64/bin/git.exe" stash You do not have the initial commit yet ✗ fail, error_code: 1 +----------------------------------------------------------+ | Show deploy config | +----------------------------------------------------------+ Repository: https://github.com/LmeSzinc/AzurLaneAutoScript Brunch: app GitExecutable: ./toolkit/Git/mingw64/bin/git.exe GitProxy: <hidden> AutoUpdate: true KeepLocalChanges: true PythonExecutable: ./toolkit/python.exe PypiMirror: null InstallDependencies: true AdbExecutable: ./toolkit/Lib/site-packages/adbutils/binaries/adb.exe ReplaceAdb: true AutoConnect: true InstallUiautomator2: true WebuiPort: 22267 ==================== Update failed ==================== Please check your deploy settings and try again
看来首次安装的时候不能打开 KeepLocalChanges ,需要安装过一次,有 commit 才能保留本地修改
已在 v0.3.1 的安装包中修复
should skip git stash and pop in the first installation or ignore error of git stash or pop
Log