Fix parsing of git version

VirtusLab · Dec 24, 2019 · 8e0f5d1 · 8e0f5d1
1 parent 2d5c625
commit 8e0f5d1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,9 @@
 # Release notes
 
+## New in git-machete 2.12.6
+
+- fixed: trailing parts of the output of `git --version` are now removed
+
 ## New in git-machete 2.12.5
 
 - improved: validation of generated Debian packages

diff --git a/git_machete/__init__.py b/git_machete/__init__.py
@@ -1 +1 @@
-__version__ = '2.12.5'
+__version__ = '2.12.6'
diff --git a/git_machete/cmd.py b/git_machete/cmd.py
@@ -459,8 +459,8 @@ def edit():
 def get_git_version():
     global git_version
     if not git_version:
-        git_version = tuple(map(int, popen_git("version").strip()
-                                .replace("git version ", "").split(".")))
+        raw = re.search(r"\d+.\d+.\d+", popen_git("version")).group(0)
+        git_version = tuple(map(int, raw.split(".")))
     return git_version