diff options
| author | Karun <karun.ellango7@gmail.com> | 2023-03-25 09:12:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-25 09:12:55 +0000 |
| commit | 63a2f8d8225228a52b3ca7f19d2ba1fd07a6234b (patch) | |
| tree | 9a7c38070d83b409895704125525dfc70cc21215 /modules/extensions.py | |
| parent | ca2b8faa83076a21dd14c974f03f88eb6da57485 (diff) | |
| parent | 70615448b2ef3285dba9bb1992974cb1eaf10995 (diff) | |
| download | stable-diffusion-webui-gfx803-63a2f8d8225228a52b3ca7f19d2ba1fd07a6234b.tar.gz stable-diffusion-webui-gfx803-63a2f8d8225228a52b3ca7f19d2ba1fd07a6234b.tar.bz2 stable-diffusion-webui-gfx803-63a2f8d8225228a52b3ca7f19d2ba1fd07a6234b.zip | |
Merge branch 'master' into master
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():
|