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

Fix running tests with non standard default branch 

When the global git config has init.defaultbranch set to
something other than master the tests fail. This is because
the tests assume that the default branch is called master
but that may not be the case.

This fixes the tests by ensuring that when running git init
we ensure the default branch is called master regardless of
how git is configured.
pull/9378/head
Robert Rhoades 2020-10-29 21:13:05 +00:00
parent 51685580c7
commit e6c7ab693e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php
View File

@ -115,7 +115,7 @@ class ArchiveManagerTest extends ArchiverTest
chdir($this->testDir);
$output = null;
$result = $this->process->execute('git init -q', $output, $this->testDir);
$result = $this->process->execute('git init -q -b master', $output, $this->testDir);
if ($result > 0) {
chdir($currentWorkDir);
throw new \RuntimeException('Could not init: '.$this->process->getErrorOutput());

2
tests/Composer/Test/Repository/VcsRepositoryTest.php
View File

@ -58,7 +58,7 @@ class VcsRepositoryTest extends TestCase
}
};
$exec('git init');
$exec('git init -q -b master');
$exec('git config user.email composertest@example.org');
$exec('git config user.name ComposerTest');
$exec('git config commit.gpgsign false');