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

Merge branch '1.10'

pull/9026/head
Jordi Boggiano 2020-06-24 21:35:38 +02:00
parent 74d89d7110 95a176c87c
commit 821e575658
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -46,9 +46,15 @@
* Fixed suggest output being very spammy, it now is only one line long and shows more rarely * Fixed suggest output being very spammy, it now is only one line long and shows more rarely
* Fixed conflict rules like e.g. >=5 from matching dev-master, as it is not normalized to 9999999-dev internally anymore * Fixed conflict rules like e.g. >=5 from matching dev-master, as it is not normalized to 9999999-dev internally anymore
### [1.10.8] 2020-06-24
* Fixed compatibility issue with git being configured to show signatures by default
* Fixed discarding of local changes when updating packages to include untracked files
* Several minor fixes
### [1.10.7] 2020-06-03 ### [1.10.7] 2020-06-03
* Fix PHP 8 deprecations * Fixed PHP 8 deprecations
* Fixed detection of pcntl_signal being in disabled_functions when pcntl_async_signal is allowed * Fixed detection of pcntl_signal being in disabled_functions when pcntl_async_signal is allowed
### [1.10.6] 2020-05-06 ### [1.10.6] 2020-05-06
@ -910,6 +916,7 @@
[2.0.0-alpha2]: https://github.com/composer/composer/compare/2.0.0-alpha1...2.0.0-alpha2 [2.0.0-alpha2]: https://github.com/composer/composer/compare/2.0.0-alpha1...2.0.0-alpha2
[2.0.0-alpha1]: https://github.com/composer/composer/compare/1.10.7...2.0.0-alpha1 [2.0.0-alpha1]: https://github.com/composer/composer/compare/1.10.7...2.0.0-alpha1
[1.10.8]: https://github.com/composer/composer/compare/1.10.7...1.10.8
[1.10.7]: https://github.com/composer/composer/compare/1.10.6...1.10.7 [1.10.7]: https://github.com/composer/composer/compare/1.10.6...1.10.7
[1.10.6]: https://github.com/composer/composer/compare/1.10.5...1.10.6 [1.10.6]: https://github.com/composer/composer/compare/1.10.5...1.10.6
[1.10.5]: https://github.com/composer/composer/compare/1.10.4...1.10.5 [1.10.5]: https://github.com/composer/composer/compare/1.10.4...1.10.5

14
src/Composer/Repository/Vcs/GitDriver.php
View File

@ -222,7 +222,17 @@ class GitDriver extends VcsDriver
return false; return false;
} }
$process = new ProcessExecutor($io); $gitUtil = new GitUtil($io, $config, new ProcessExecutor($io), new Filesystem());
return $process->execute('git ls-remote --heads ' . ProcessExecutor::escape($url), $output) === 0; GitUtil::cleanEnv();
try {
$gitUtil->runCommand(function ($url) {
return 'git ls-remote --heads ' . ProcessExecutor::escape($url);
}, $url, sys_get_temp_dir());
} catch (\RuntimeException $e) {
return false;
}
return true;
} }
} }