From 3a5f8247553b3ca9900974daf08cebb5338ffe16 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Thu, 17 Feb 2022 18:26:47 -0600 Subject: [PATCH] Addon Manager: Add -ff-only option to pull --- src/Mod/AddonManager/addonmanager_workers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mod/AddonManager/addonmanager_workers.py b/src/Mod/AddonManager/addonmanager_workers.py index 96fe7b41e2..e472bda86d 100644 --- a/src/Mod/AddonManager/addonmanager_workers.py +++ b/src/Mod/AddonManager/addonmanager_workers.py @@ -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.",