Addon Manager: Support older git versions

2022-08-25 09:50:03 -05:00
parent 3a47916d9b
commit 6ef7ae0404
1 changed files with 5 additions and 1 deletions
--- 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