Fix git init -b being unavailable for older versions
On older versions of git init doesn't have the -b flag. That was introduced in v2.28.0. Instead switch to using git checkout -b which has much wider support (2.4.12 was as far back as I could check on the docs).pull/9387/head
parent
e6c7ab693e
commit
2ced7b0bf8
|
@ -115,12 +115,18 @@ class ArchiveManagerTest extends ArchiverTest
|
|||
chdir($this->testDir);
|
||||
|
||||
$output = null;
|
||||
$result = $this->process->execute('git init -q -b master', $output, $this->testDir);
|
||||
$result = $this->process->execute('git init -q', $output, $this->testDir);
|
||||
if ($result > 0) {
|
||||
chdir($currentWorkDir);
|
||||
throw new \RuntimeException('Could not init: '.$this->process->getErrorOutput());
|
||||
}
|
||||
|
||||
$result = $this->process->execute('git checkout -b master', $output, $this->testDir);
|
||||
if ($result > 0) {
|
||||
chdir($currentWorkDir);
|
||||
throw new \RuntimeException('Could not checkout master branch: '.$this->process->getErrorOutput());
|
||||
}
|
||||
|
||||
$result = $this->process->execute('git config user.email "you@example.com"', $output, $this->testDir);
|
||||
if ($result > 0) {
|
||||
chdir($currentWorkDir);
|
||||
|
|
|
@ -58,7 +58,8 @@ class VcsRepositoryTest extends TestCase
|
|||
}
|
||||
};
|
||||
|
||||
$exec('git init -q -b master');
|
||||
$exec('git init -q');
|
||||
$exec('git checkout -b master');
|
||||
$exec('git config user.email composertest@example.org');
|
||||
$exec('git config user.name ComposerTest');
|
||||
$exec('git config commit.gpgsign false');
|
||||
|
|
Loading…
Reference in New Issue