diff options
| author | InvincibleDude <81354513+InvincibleDude@users.noreply.github.com> | 2023-03-14 13:55:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-14 13:55:59 +0000 |
| commit | f5e44364535ccc7efef445dacb6395c3942f2f17 (patch) | |
| tree | ca7384e6225fccdae1e89db1e0ccc44dd60c7311 /modules/extensions.py | |
| parent | f6e27378404631d951656388fc178b784fe1495b (diff) | |
| parent | a9fed7c364061ae6efb37f797b6b522cb3cf7aa2 (diff) | |
| download | stable-diffusion-webui-gfx803-f5e44364535ccc7efef445dacb6395c3942f2f17.tar.gz stable-diffusion-webui-gfx803-f5e44364535ccc7efef445dacb6395c3942f2f17.tar.bz2 stable-diffusion-webui-gfx803-f5e44364535ccc7efef445dacb6395c3942f2f17.zip | |
Merge branch 'master' into improved-hr-conflict-test
Diffstat (limited to 'modules/extensions.py')
| -rw-r--r-- | modules/extensions.py | 6 |
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():
|