diff options
| author | Christian Weiske <cweiske@cweiske.de> | 2014-07-08 06:55:57 +0200 |
|---|---|---|
| committer | Christian Weiske <cweiske@cweiske.de> | 2014-07-08 06:55:57 +0200 |
| commit | 583c94a962d155468bb848d00aab5fe5d6eb95c8 (patch) | |
| tree | 607c12d530e3f862f3272dddd1c9b9e4fbf6af0a /src/phorkie | |
| parent | 41e402a74c94f6567519c2be0704848bef17868f (diff) | |
| download | phorkie-583c94a962d155468bb848d00aab5fe5d6eb95c8.tar.gz phorkie-583c94a962d155468bb848d00aab5fe5d6eb95c8.zip | |
fix git version detection on OSX
Diffstat (limited to 'src/phorkie')
| -rw-r--r-- | src/phorkie/SetupCheck.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/phorkie/SetupCheck.php b/src/phorkie/SetupCheck.php index 557d85c..c4d365c 100644 --- a/src/phorkie/SetupCheck.php +++ b/src/phorkie/SetupCheck.php @@ -101,8 +101,9 @@ class SetupCheck if ($retval !== 0) { $this->fail('Running git executable failed.'); } - if (!preg_match('#^git version ([0-9.]+(rc[0-9]+)?)$#', $line, $matches)) { + if (!preg_match('#^git version ([0-9.]+(rc[0-9]+)?)(?: \(Apple Git-\d+\))?$#', $line, $matches)) { $this->fail('git version output format unexpected: ' . $line); + return; } if (version_compare($matches[1], '1.7.5') < 0) { $this->fail( |