From 6ef7ae04048cd001533b62bf75b1b17179f0604a Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Thu, 25 Aug 2022 09:50:03 -0500 Subject: [PATCH] Addon Manager: Support older git versions --- src/Mod/AddonManager/addonmanager_git.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Mod/AddonManager/addonmanager_git.py b/src/Mod/AddonManager/addonmanager_git.py index fc79bf926b..5cbc089291 100644 --- a/src/Mod/AddonManager/addonmanager_git.py +++ b/src/Mod/AddonManager/addonmanager_git.py @@ -191,7 +191,11 @@ class GitManager: old_dir = os.getcwd() os.chdir(local_path) try: - branch = self._synchronous_call_git(["branch", "--show-current"]).strip() + # This only works with git 2.22 and later (June 2019) + # branch = self._synchronous_call_git(["branch", "--show-current"]).strip() + + # This is more universal: + branch = self._synchronous_call_git(["rev-parse", "--abbrev-ref", "HEAD"]).strip() except GitFailed as e: os.chdir(old_dir) raise e