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/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/extensions.py')
| -rw-r--r-- | modules/extensions.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/extensions.py b/modules/extensions.py index 94ce479a..db9c4200 100644 --- a/modules/extensions.py +++ b/modules/extensions.py @@ -65,9 +65,12 @@ class Extension: self.can_update = False
self.status = "latest"
- def pull(self):
+ def fetch_and_reset_hard(self):
repo = git.Repo(self.path)
- repo.remotes.origin.pull()
+ # 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')
def list_extensions():
|