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

Revert issue in previous fix

pull/12217/head
Jordi Boggiano 2024-06-10 22:41:26 +02:00
parent 54a3beda47
commit e9560a619e
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Package/Version/VersionGuesser.php
View File

@ -176,7 +176,7 @@ class VersionGuesser
$featurePrettyVersion = $prettyVersion; $featurePrettyVersion = $prettyVersion;
// try to find the best (nearest) version branch to assume this feature's version // try to find the best (nearest) version branch to assume this feature's version
$result = $this->guessFeatureVersion($packageConfig, $version, $branches, 'git rev-list -- %candidate%..%branch%', $path, '%candidate%..%branch%'); $result = $this->guessFeatureVersion($packageConfig, $version, $branches, 'git rev-list %candidate%..%branch%', $path, '%candidate%..%branch%');
$version = $result['version']; $version = $result['version'];
$prettyVersion = $result['pretty_version']; $prettyVersion = $result['pretty_version'];
} }

6
tests/Composer/Test/Package/Version/VersionGuesserTest.php
View File

@ -121,7 +121,7 @@ class VersionGuesserTest extends TestCase
'stdout' => " arbitrary $commitHash Commit message\n* feature $anotherCommitHash Another message\n", 'stdout' => " arbitrary $commitHash Commit message\n* feature $anotherCommitHash Another message\n",
), ),
array( array(
'cmd' => 'git rev-list -- arbitrary..feature', 'cmd' => 'git rev-list arbitrary..feature',
'stdout' => "$anotherCommitHash\n", 'stdout' => "$anotherCommitHash\n",
), ),
), true); ), true);
@ -151,7 +151,7 @@ class VersionGuesserTest extends TestCase
'stdout' => " latest-testing $commitHash Commit message\n* feature $anotherCommitHash Another message\n", 'stdout' => " latest-testing $commitHash Commit message\n* feature $anotherCommitHash Another message\n",
), ),
array( array(
'cmd' => 'git rev-list -- latest-testing..feature', 'cmd' => 'git rev-list latest-testing..feature',
'stdout' => "$anotherCommitHash\n", 'stdout' => "$anotherCommitHash\n",
), ),
), true); ), true);
@ -364,7 +364,7 @@ class VersionGuesserTest extends TestCase
"remotes/origin/1.5 03a15d220da53c52eddd5f32ffca64a7b3801bea Commit message\n", "remotes/origin/1.5 03a15d220da53c52eddd5f32ffca64a7b3801bea Commit message\n",
), ),
array( array(
'cmd' => 'git rev-list -- remotes/origin/1.5..feature-branch', 'cmd' => 'git rev-list remotes/origin/1.5..feature-branch',
'stdout' => "\n", 'stdout' => "\n",
), ),
), true); ), true);