mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Fixed rollback bug in GitPreparer

Browse Source 
Added a guard to GitPreparer::unsetVcsInProgress() to prevent doing a
`git reset` when there are no test locks present.

Otherwise, the uncommitted changes in the app will be removed by the
shutdown feature introduced in 952c6e5890.
This commit is contained in:
Nick Liu
2018-11-01 09:32:43 -05:00
parent 93d8b7f0c5
commit 1fc01e08f0
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/preparers/GitPreparer.php
View File

@@ -7,11 +7,13 @@ class GitPreparer implements Preparer
public function snapshot() public function snapshot()
{ {
$this->debug('Snapshot requested');
return $this->setVcsInProgress(); return $this->setVcsInProgress();
} }
public function rollback() public function rollback()
{ {
$this->debug('Rollback requested');
return $this->unsetVcsInProgress(); return $this->unsetVcsInProgress();
} }
@@ -88,6 +90,12 @@ class GitPreparer implements Preparer
protected function unsetVcsInProgress() protected function unsetVcsInProgress()
{ {
if (!$this->isVcsInProgress())
{
$this->debug('No test locks found');
return;
}
$this->debug('Rolling back Git repo to pre-test state…'); $this->debug('Rolling back Git repo to pre-test state…');
$this->runCommand('git reset --hard HEAD'); $this->runCommand('git reset --hard HEAD');
$this->runCommand('git clean -fdx'); $this->runCommand('git clean -fdx');