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

Merge pull request #7079 from carusogabriel/misspelling 

Fix misspelling
pull/7095/head
Jordi Boggiano 2018-02-08 20:46:07 +01:00 committed by GitHub
parent 08f769220a f722f952e7
commit 3c09c0ab2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -169,7 +169,7 @@
* Added `COMPOSER_MIRROR_PATH_REPOS` env var to force mirroring of path repositories vs symlinking
* Added `COMPOSER_DEV_MODE` env var that is set by Composer to forward the dev mode to script handlers
* Fixed support for git 2.11
* Fixed output from zip and rar leaking out when an error occured
* Fixed output from zip and rar leaking out when an error occurred
* Removed `hash` from composer.lock, only `content-hash` is now used which should reduce conflicts
* Minor fixes and performance improvements

2
src/Composer/Repository/Vcs/GitLabDriver.php
View File

@ -129,7 +129,7 @@ class GitLabDriver extends VcsDriver
return $this->gitDriver->getFileContent($file, $identifier);
}
// Convert the root identifier to a cachable commit id
// Convert the root identifier to a cacheable commit id
if (!preg_match('{[a-f0-9]{40}}i', $identifier)) {
$branches = $this->getBranches();
if (isset($branches[$identifier])) {