From 215556df7cd2e5e09df8a0984d86f19659e4bdc7 Mon Sep 17 00:00:00 2001 From: Beau Simensen Date: Tue, 21 May 2013 09:59:41 -0500 Subject: [PATCH] Use --tags to get non-annotated tags as well. --- src/Composer/Package/Loader/RootPackageLoader.php | 2 +- tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Composer/Package/Loader/RootPackageLoader.php b/src/Composer/Package/Loader/RootPackageLoader.php index dae3ffdad..057afd170 100644 --- a/src/Composer/Package/Loader/RootPackageLoader.php +++ b/src/Composer/Package/Loader/RootPackageLoader.php @@ -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)); } diff --git a/tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php b/tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php index dd22bcd0f..a9422d91a 100644 --- a/tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php +++ b/tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php @@ -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";