git.cweiske.de
/
phorkie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
41e402a
)
fix git version detection on OSX
author
Christian Weiske
<cweiske@cweiske.de>
Tue, 8 Jul 2014 04:55:57 +0000
(06:55 +0200)
committer
Christian Weiske
<cweiske@cweiske.de>
Tue, 8 Jul 2014 04:55:57 +0000
(06:55 +0200)
src/phorkie/SetupCheck.php
patch
|
blob
|
history
diff --git
a/src/phorkie/SetupCheck.php
b/src/phorkie/SetupCheck.php
index 557d85c5a3d002c0ec04f1cdc110c625d47c4e98..c4d365c7a79552166aea7e88413f44ef0087f821 100644
(file)
--- 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(