From 5ff142329831c95c968731944edd4389795c829f Mon Sep 17 00:00:00 2001 From: Stephan Vock Date: Fri, 19 Jun 2020 10:24:40 +0100 Subject: [PATCH 1/3] GitDriver: use authentication for supports check --- src/Composer/Repository/Vcs/GitDriver.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Composer/Repository/Vcs/GitDriver.php b/src/Composer/Repository/Vcs/GitDriver.php index cc6e3edb4..1900c6321 100644 --- a/src/Composer/Repository/Vcs/GitDriver.php +++ b/src/Composer/Repository/Vcs/GitDriver.php @@ -219,8 +219,17 @@ class GitDriver extends VcsDriver return false; } - $process = new ProcessExecutor($io); + $gitUtil = new GitUtil($io, $config, new ProcessExecutor($io), new Filesystem()); + GitUtil::cleanEnv(); - return $process->execute('git ls-remote --heads ' . ProcessExecutor::escape($url), $output) === 0; + try { + $gitUtil->runCommand(function ($url) { + return 'git ls-remote --heads ' . ProcessExecutor::escape($url); + }, $url, null); + } catch (\RuntimeException $e) { + return false; + } + + return true; } } From 52332d994e2944c72f9d49296932d98b5cbfe68c Mon Sep 17 00:00:00 2001 From: Stephan Vock Date: Fri, 19 Jun 2020 10:24:40 +0100 Subject: [PATCH 2/3] GitDriver: use authentication for supports check --- src/Composer/Repository/Vcs/GitDriver.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Composer/Repository/Vcs/GitDriver.php b/src/Composer/Repository/Vcs/GitDriver.php index cc6e3edb4..8c6902298 100644 --- a/src/Composer/Repository/Vcs/GitDriver.php +++ b/src/Composer/Repository/Vcs/GitDriver.php @@ -219,8 +219,17 @@ class GitDriver extends VcsDriver return false; } - $process = new ProcessExecutor($io); + $gitUtil = new GitUtil($io, $config, new ProcessExecutor($io), new Filesystem()); + GitUtil::cleanEnv(); - return $process->execute('git ls-remote --heads ' . ProcessExecutor::escape($url), $output) === 0; + 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; } } From 95a176c87c29b0e44c05b0a685af9d217cabb053 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 24 Jun 2020 21:23:12 +0200 Subject: [PATCH 3/3] Prepare 1.10.8 release --- CHANGELOG.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 962a7759b..f80d676df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ +### [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 - * Fix PHP 8 deprecations + * Fixed PHP 8 deprecations * Fixed detection of pcntl_signal being in disabled_functions when pcntl_async_signal is allowed ### [1.10.6] 2020-05-06 @@ -860,6 +866,7 @@ * Initial release +[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.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