From 7449d6950a0e53c34668648a716c7ef0753acb7b Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 5 Jun 2021 18:30:28 -0500 Subject: Fix git_version on macOS (#24163) --- lib/spack/spack/fetch_strategy.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index f885980ccd..da0b12556f 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -780,8 +780,9 @@ class GitFetchStrategy(VCSFetchStrategy): @property def git_version(self): - vstring = self.git('--version', output=str).lstrip('git version ') - return Version(vstring) + output = self.git('--version', output=str, error=str) + match = re.search(r'git version (\S+)', output) + return Version(match.group(1)) if match else None @property def git(self): -- cgit v1.2.3-70-g09d2