Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-03-13 01:26:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable Git branch checkout

Browse Source
This commit is contained in:
Janek Bevendorff 2025-03-11 18:18:10 +01:00
parent c7f786d7f2
commit 75ce550c64
No known key found for this signature in database
GPG Key ID: 2CF41D2AA8438F99
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
release-tool.py
View File

@ -222,9 +222,8 @@ def _git_checkout(branch, *, cwd):
global _GIT_ORIG_BRANCH_CWD
if not _GIT_ORIG_BRANCH_CWD:
_GIT_ORIG_BRANCH_CWD = (_git_get_branch(cwd=cwd), cwd)
logger.info('Checking out branch "%s"...', branch)
# _run(['git', 'checkout', branch], cwd=cwd, text=True)
_run(['git', 'checkout', branch], cwd=cwd, text=True)
except SubprocessError as e:
raise Error('Failed to check out branch "%s". %s', branch, e)
@ -250,7 +249,7 @@ def _cleanup():
try:
if _GIT_ORIG_BRANCH_CWD:
logger.info('Checking out original branch...')
# _git_checkout(_ORIG_GIT_BRANCH_CWD[0], cwd=_ORIG_GIT_BRANCH_CWD[1])
_git_checkout(_GIT_ORIG_BRANCH_CWD[0], cwd=_GIT_ORIG_BRANCH_CWD[1])
return 0
except Exception as e:
logger.critical('Exception occurred during cleanup:', exc_info=e)
@ -357,8 +356,6 @@ class Check(Command):
@staticmethod
def check_working_tree_clean(cwd):
# TODO: Remove
return
if not _git_working_dir_clean(cwd=cwd):
raise Error('Current working tree is not clean! Please commit or unstage any changes.')