git 3.1.30 api change
This commit is contained in:
parent
0cc0ee1bcb
commit
6d92d95a33
@ -66,7 +66,7 @@ class Extension:
|
|||||||
|
|
||||||
def check_updates(self):
|
def check_updates(self):
|
||||||
repo = git.Repo(self.path)
|
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:
|
if fetch.flags != fetch.HEAD_UPTODATE:
|
||||||
self.can_update = True
|
self.can_update = True
|
||||||
self.status = "behind"
|
self.status = "behind"
|
||||||
@ -79,8 +79,8 @@ class Extension:
|
|||||||
repo = git.Repo(self.path)
|
repo = git.Repo(self.path)
|
||||||
# Fix: `error: Your local changes to the following files would be overwritten by merge`,
|
# 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.
|
# because WSL2 Docker set 755 file permissions instead of 644, this results to the error.
|
||||||
repo.git.fetch('--all')
|
repo.git.fetch(all=True)
|
||||||
repo.git.reset('--hard', 'origin')
|
repo.git.reset('origin', hard=True)
|
||||||
|
|
||||||
|
|
||||||
def list_extensions():
|
def list_extensions():
|
||||||
|
Loading…
Reference in New Issue
Block a user