Browse Source

Fix parsing of empty git commits, fixes #3565

Jordi Boggiano 10 years ago
parent
commit
e0291f3a30
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/Composer/Repository/Vcs/GitDriver.php

+ 1 - 1
src/Composer/Repository/Vcs/GitDriver.php

@@ -202,7 +202,7 @@ class GitDriver extends VcsDriver
             $this->process->execute('git branch --no-color --no-abbrev -v', $output, $this->repoDir);
             $this->process->execute('git branch --no-color --no-abbrev -v', $output, $this->repoDir);
             foreach ($this->process->splitLines($output) as $branch) {
             foreach ($this->process->splitLines($output) as $branch) {
                 if ($branch && !preg_match('{^ *[^/]+/HEAD }', $branch)) {
                 if ($branch && !preg_match('{^ *[^/]+/HEAD }', $branch)) {
-                    if (preg_match('{^(?:\* )? *(\S+) *([a-f0-9]+) .*$}', $branch, $match)) {
+                    if (preg_match('{^(?:\* )? *(\S+) *([a-f0-9]+)(?: .*)?$}', $branch, $match)) {
                         $branches[$match[1]] = $match[2];
                         $branches[$match[1]] = $match[2];
                     }
                     }
                 }
                 }