Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

git 3.1.30 api change, issue #8116 #8118

Merged
merged 3 commits into from
Mar 11, 2023
Merged

git 3.1.30 api change, issue #8116 #8118

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d92d95
git 3.1.30 api change
adam-huganir Feb 25, 2023
b14d8b6
version bump for git python due to CVE-2022-24439
adam-huganir Mar 1, 2023
1e1a32b
Update requirements_versions.txt
adam-huganir Mar 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/extensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def list_files(self, subdir, 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"
Expand All @@ -79,8 +79,8 @@ def fetch_and_reset_hard(self):
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():
Expand Down