kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Addon Manager: Add -ff-only option to pull

Browse Source
This commit is contained in:
Chris Hennes
2022-02-17 18:26:47 -06:00
parent ef8be833fd
commit 3a5f824755
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/AddonManager/addonmanager_workers.py
View File

@@ -635,7 +635,7 @@ class FillMacroListWorker(QtCore.QThread):
"https://github.com/FreeCAD/FreeCAD-macros.git", self.repo_dir
)
gitrepo = git.Git(self.repo_dir)
gitrepo.pull()
gitrepo.pull("--ff-only")
else:
git.Repo.clone_from(
"https://github.com/FreeCAD/FreeCAD-macros.git", self.repo_dir
@@ -998,7 +998,7 @@ class InstallWorkbenchWorker(QtCore.QThread):
utils.repair_git_repo(self.repo.url, clonedir)
repo = git.Git(clonedir)
try:
repo.pull() # Refuses to take a progress object?
repo.pull("--ff-only") # Refuses to take a progress object?
answer = translate(
"AddonsInstaller",
"Workbench successfully updated. Please restart FreeCAD to apply the changes.",