Skip to content

Commit

Permalink
Merge pull request #8118 from adam-huganir/8116-gitpython-api-breakin…
Browse files Browse the repository at this point in the history
…g-change

git 3.1.30 api change, issue #8116
  • Loading branch information
AUTOMATIC1111 authored Mar 11, 2023
2 parents d3dd6cc + 1e1a32b commit e0ca785
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions modules/extensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def list_files(self, subdir, 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"
Expand All @@ -79,8 +79,8 @@ def fetch_and_reset_hard(self):
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():
Expand Down

0 comments on commit e0ca785

Please sign in to comment.