Browse Source

Merge pull request #757 from stof/patch-2

Fixed undefined variable when no branch match.
Nils Adermann 12 years ago
parent
commit
639aba6f99
1 changed files with 2 additions and 0 deletions
  1. 2 0
      src/Composer/Package/Loader/RootPackageLoader.php

+ 2 - 0
src/Composer/Package/Loader/RootPackageLoader.php

@@ -159,6 +159,8 @@ class RootPackageLoader extends ArrayLoader
         // try to fetch current version from git branch
         if (0 === $this->process->execute('git branch --no-color --no-abbrev -v', $output)) {
             $branches = array();
+            $isFeatureBranch = true;
+            $version = null;
             foreach ($this->process->splitLines($output) as $branch) {
                 if ($branch && preg_match('{^(?:\* ) *(?:[^/ ]+?/)?(\S+|\(no branch\)) *([a-f0-9]+) .*$}', $branch, $match)) {
                     if ($match[1] === '(no branch)') {