robust update patch

2023-07-25 12:35:42 +09:00
parent c0164cc7cd
commit f534cf27e6
5 changed files with 20 additions and 8 deletions
--- a/git_helper.py
+++ b/git_helper.py
@@ -47,8 +47,11 @@ def gitpull(path):

    # Pull the latest changes from the remote repository
    repo = git.Repo(path)
+    if repo.is_dirty():
+        repo.git.stash()
+
    origin = repo.remote(name='origin')
-    origin.pull()
+    origin.pull(rebase=True)
    repo.git.submodule('update', '--init', '--recursive')

    repo.close()