Merge pull request #8118 from adam-huganir/8116-gitpython-api-breaking-change

git 3.1.30 api change, issue #8116

1 files changed, 3 insertions, 3 deletions

diff --git a/modules/extensions.py b/modules/extensions.py
index 3eef9eaf..ed4b58fe 100644
--- a/modules/extensions.py
+++ b/modules/extensions.py
@@ -66,7 +66,7 @@ class Extension:
 

     def check_updates(self):

         repo = git.Repo(self.path)

-        for fetch in repo.remote().fetch("--dry-run"):

+        for fetch in repo.remote().fetch(dry_run=True):

             if fetch.flags != fetch.HEAD_UPTODATE:

                 self.can_update = True

                 self.status = "behind"

@@ -79,8 +79,8 @@ class Extension:
         repo = git.Repo(self.path)

         # Fix: `error: Your local changes to the following files would be overwritten by merge`,

         # because WSL2 Docker set 755 file permissions instead of 644, this results to the error.

-        repo.git.fetch('--all')

-        repo.git.reset('--hard', 'origin')

+        repo.git.fetch(all=True)

+        repo.git.reset('origin', hard=True)

 

 

 def list_extensions():