Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
Stable Diffusion Webui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
novelai-storage
Stable Diffusion Webui
Commits
e0ca7850
Commit
e0ca7850
authored
Mar 11, 2023
by
AUTOMATIC1111
Committed by
GitHub
Mar 11, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8118 from adam-huganir/8116-gitpython-api-breaking-change
git 3.1.30 api change, issue #8116
parents
d3dd6cc0
1e1a32b1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
modules/extensions.py
modules/extensions.py
+3
-3
No files found.
modules/extensions.py
View file @
e0ca7850
...
@@ -66,7 +66,7 @@ class Extension:
...
@@ -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:
...
@@ -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
():
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment