diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2022-11-19 12:22:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-19 12:22:51 +0300 |
| commit | aee611adb874fbabcdeea154a35908ae1f9a4bbf (patch) | |
| tree | 8eef9125b87be670cd3b0ab8946aa6d31dc287e9 /modules/ui_extensions.py | |
| parent | 5bfef6e06345540a737a8759649017e5c2ea180c (diff) | |
| parent | d671d1d45dfab61292ed788fd7778a33a82212ee (diff) | |
Merge pull request #4646 from mrauhu/force-update-extensions
Fix: `error: Your local changes to the following files would be overwritten by merge` when trying to update extensions in WSL2 Docker
Diffstat (limited to 'modules/ui_extensions.py')
| -rw-r--r-- | modules/ui_extensions.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py index 6671cb60..030f011e 100644 --- a/modules/ui_extensions.py +++ b/modules/ui_extensions.py @@ -36,9 +36,9 @@ def apply_and_restart(disable_list, update_list): continue
try:
- ext.pull()
+ ext.fetch_and_reset_hard()
except Exception:
- print(f"Error pulling updates for {ext.name}:", file=sys.stderr)
+ print(f"Error getting updates for {ext.name}:", file=sys.stderr)
print(traceback.format_exc(), file=sys.stderr)
shared.opts.disabled_extensions = disabled
|