public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Use regex to capture git version.

pull/5384/head
Marco Villegas 2016-06-18 17:43:25 -05:00
parent b5c55d5167
commit 75b88a13fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Util/Git.php
View File

@ -282,9 +282,9 @@ class Git
if (0 !== $this->process->execute('git --version', $output)) { if (0 !== $this->process->execute('git --version', $output)) {
throw new \RuntimeException(self::sanitizeUrl('Failed retrieve git version, git was not found, check that it is installed and in your PATH env.' . "\n\n" . $this->process->getErrorOutput())); throw new \RuntimeException(self::sanitizeUrl('Failed retrieve git version, git was not found, check that it is installed and in your PATH env.' . "\n\n" . $this->process->getErrorOutput()));
} }
if (strpos($output, 'git version ') === FALSE) { if (preg_match('/^git version (.*)/', $output, $matches) !== 1) {
throw new \RuntimeException('git --version output seems to have changed, expected "git version x.y.z".'); throw new \RuntimeException('git --version output seems to have changed, expected "git version x.y.z".');
} }
return substr($output, 12); return $matches[1];
} }
} }