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/scanner.py
+++ b/scanner.py
@@ -117,7 +117,7 @@ def clone_or_pull_git_repository(git_url):
        try:
            repo = Repo(repo_dir)
            origin = repo.remote(name="origin")
-            origin.pull()
+            origin.pull(rebase=True)
            repo.git.submodule('update', '--init', '--recursive')
            print(f"Pulling {repo_name}...")
        except Exception as e: