From d7ae6c61e1b974146ab6f173bad6054d0d5e09cd Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Thu, 3 Aug 2023 17:49:52 +0200 Subject: [PATCH] git autostash --- installer.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/installer.py b/installer.py index 62510d303..0e6a28ae8 100644 --- a/installer.py +++ b/installer.py @@ -234,14 +234,18 @@ def branch(folder): # update git repository def update(folder, current_branch = False): + try: + git('config rebase.Autostash true') + except Exception: + pass if current_branch: - git('pull --autostash --rebase --force', folder) + git('pull --rebase --force', folder) return b = branch(folder) if branch is None: - git('pull --autostash --rebase --force', folder) + git('pull --rebase --force', folder) else: - git(f'pull origin {b} --autostash --rebase --force', folder) + git(f'pull origin {b} --rebase --force', folder) # clone git repository