sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 16:19:03 +08:00
Code

Fix: Git stash pop failed if there isn't any local changes

Browse Source
This commit is contained in:
LmeSzinc 2021-12-31 15:50:10 +08:00
parent 62bba1b25c
commit bd4f5d08e3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deploy/installer.py
View File

@ -117,10 +117,14 @@ class GitManager(DeployConfig):
hr1('Pull Repository Branch')
if keep_changes:
if self.execute(f'"{self.git}" stash', allow_failure=True):
self.execute(f'"{self.git}" pull {source} {branch}')
self.execute(f'"{self.git}" stash pop')
self.execute(f'"{self.git}" pull --ff-only {source} {branch}')
if self.execute(f'"{self.git}" stash pop', allow_failure=True):
pass
else:
# No local changes to existing files, untracked files not included
print('Stash pop failed, there seems to be no local changes, skip instead')
else:
print('Unable to slash, this may be the first installation, drop changes instead')
print('Stash failed, this may be the first installation, drop changes instead')
self.execute(f'"{self.git}" reset --hard {source}/{branch}')
self.execute(f'"{self.git}" pull --ff-only {source} {branch}')
else: