diff options
| author | Vespinian <vespinian@proton.me> | 2023-03-11 17:33:35 +0000 |
|---|---|---|
| committer | Vespinian <vespinian@proton.me> | 2023-03-11 17:33:35 +0000 |
| commit | 46f9fe3cd6b7be712d85cdfc2cdff7ac3fe878b5 (patch) | |
| tree | a134b22d856ab534c497b04c0d7ec87935cfcce7 /modules/extensions.py | |
| parent | 2174f58daee1e077eec1125e196d34cc93dbaf23 (diff) | |
| parent | 94ffa9fc5386e51f20692ab46906135e8de33110 (diff) | |
| download | stable-diffusion-webui-gfx803-46f9fe3cd6b7be712d85cdfc2cdff7ac3fe878b5.tar.gz stable-diffusion-webui-gfx803-46f9fe3cd6b7be712d85cdfc2cdff7ac3fe878b5.tar.bz2 stable-diffusion-webui-gfx803-46f9fe3cd6b7be712d85cdfc2cdff7ac3fe878b5.zip | |
Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui
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():
|