public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Use --tags to get non-annotated tags as well.

pull/1911/head
Beau Simensen 2013-05-21 09:59:41 -05:00
parent f9fe39e624
commit 215556df7c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Package/Loader/RootPackageLoader.php
View File

@ -185,7 +185,7 @@ class RootPackageLoader extends ArrayLoader
private function guessGitVersion(array $config)
{
// try to fetch current version from git branch as a tag
if (0 === $this->process->execute('git describe --exact-match', $output)) {
if (0 === $this->process->execute('git describe --exact-match --tags', $output)) {
return $this->versionParser->normalize(rtrim($output));
}

2
tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php
View File

@ -69,7 +69,7 @@ class RootPackageLoaderTest extends \PHPUnit_Framework_TestCase
/* Can do away with this mock object when https://github.com/sebastianbergmann/phpunit-mock-objects/issues/81 is fixed */
$processExecutor = new ProcessExecutorMock(function($command, &$output = null, $cwd = null) use ($self) {
$self->assertEquals('git describe --exact-match', $command);
$self->assertEquals('git describe --exact-match --tags', $command);
$output = "v2.0.5-alpha2";