From b1c96163ab85d6911ef0885c9e55fbb8384053b9 Mon Sep 17 00:00:00 2001 From: Kurt Kremitzki Date: Wed, 5 Jul 2017 02:42:33 -0500 Subject: [PATCH] AddonMgr: Use hard reset for addon git repair --- src/Mod/AddonManager/AddonManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mod/AddonManager/AddonManager.py b/src/Mod/AddonManager/AddonManager.py index 5749791474..a90da4410f 100644 --- a/src/Mod/AddonManager/AddonManager.py +++ b/src/Mod/AddonManager/AddonManager.py @@ -453,7 +453,7 @@ class CheckWBWorker(QtCore.QThread): with bare_repo.config_writer() as cw: cw.set('core', 'bare', False) repo = git.Repo(clonedir) - repo.head.reset() + repo.head.reset('--hard') gitrepo = git.Git(clonedir) gitrepo.fetch() if "git pull" in gitrepo.status(): @@ -667,7 +667,7 @@ class InstallWorker(QtCore.QThread): with bare_repo.config_writer() as cw: cw.set('core', 'bare', False) repo = git.Repo(clonedir) - repo.head.reset() + repo.head.reset('--hard') repo = git.Git(clonedir) answer = repo.pull() else: