Reverse order of version guessing for git, fixes #4673

src/Composer/Package/Version/VersionGuesser.php

@@ -81,9 +81,8 @@ class VersionGuesser
     private function guessGitVersion(array $packageConfig, $path)
     {
         GitUtil::cleanEnv();
-        $version = null;
         $commit = null;
-        $version = $this->versionFromGitTags($path);
+        $version = null;
 
         // try to fetch current version from git branch
         if (0 === $this->process->execute('git branch --no-color --no-abbrev -v', $output, $path)) {
@@ -93,16 +92,14 @@ class VersionGuesser
             // find current branch and collect all branch names
             foreach ($this->process->splitLines($output) as $branch) {
                 if ($branch && preg_match('{^(?:\* ) *(\(no branch\)|\(detached from \S+\)|\S+) *([a-f0-9]+) .*$}', $branch, $match)) {
-                    if (!$version) {
+                    if ($match[1] === '(no branch)' || substr($match[1], 0, 10) === '(detached ') {
-                        if ($match[1] === '(no branch)' || substr($match[1], 0, 10) === '(detached ') {
+                        $version = 'dev-' . $match[2];
-                            $version = 'dev-' . $match[2];
+                        $isFeatureBranch = true;
-                            $isFeatureBranch = true;
+                    } else {
-                        } else {
+                        $version = $this->versionParser->normalizeBranch($match[1]);
-                            $version = $this->versionParser->normalizeBranch($match[1]);
+                        $isFeatureBranch = 0 === strpos($version, 'dev-');
-                            $isFeatureBranch = 0 === strpos($version, 'dev-');
+                        if ('9999999-dev' === $version) {
-                            if ('9999999-dev' === $version) {
+                            $version = 'dev-' . $match[1];
-                                $version = 'dev-' . $match[1];
-                            }
                         }
                     }
 
@@ -124,6 +121,10 @@ class VersionGuesser
             }
         }
 
+        if (!$version) {
+            $version = $this->versionFromGitTags($path);
+        }
+
         return array('version' => $version, 'commit' => $commit);
     }