Better git version check

This commit is contained in:
Ruud
2012-03-11 02:46:08 +01:00
parent 34611e1061
commit eceaf465f0

View File

@@ -144,7 +144,7 @@ class LocalRepository(Repository):
def getGitVersion(self): def getGitVersion(self):
if self._version is None: if self._version is None:
version_output = self._getOutputAssertSuccess("version") version_output = self._getOutputAssertSuccess("version")
version_match = re.match(r"git\s+version\s+(\S+)$", version_output, re.I) version_match = re.match(r"git\s+version\s+(\S+)[\s\(]?", version_output, re.I)
if version_match is None: if version_match is None:
raise GitException("Cannot extract git version (unfamiliar output format %r?)" % version_output) raise GitException("Cannot extract git version (unfamiliar output format %r?)" % version_output)
self._version = version_match.group(1) self._version = version_match.group(1)