Skip to content
Snippets Groups Projects
Commit d0e782ec authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

fix reading cached branches

parent 795fc483
No related branches found
No related tags found
1 merge request!62V2.0
...@@ -292,8 +292,6 @@ class vcs implements iVcs { ...@@ -292,8 +292,6 @@ class vcs implements iVcs {
$this->log(__FUNCTION__." - command ended with rc=$iRc ". '<pre>'.implode("\n", $aOutput).'</pre>', ($iRc==0 ? 'info':'error')); $this->log(__FUNCTION__." - command ended with rc=$iRc ". '<pre>'.implode("\n", $aOutput).'</pre>', ($iRc==0 ? 'info':'error'));
if ($iRc == 0) { if ($iRc == 0) {
// use cache that getCommitmessageByBranch can access it
$this->_aRemoteBranches = $oCache->read();
$this->log(__FUNCTION__ . ' start reading all branches'); $this->log(__FUNCTION__ . ' start reading all branches');
// $this->log(__FUNCTION__ . ' data from cache: <pre>'.print_r($this->_aRemoteBranches, 1).'</pre>'); // $this->log(__FUNCTION__ . ' data from cache: <pre>'.print_r($this->_aRemoteBranches, 1).'</pre>');
/** /**
...@@ -343,6 +341,9 @@ class vcs implements iVcs { ...@@ -343,6 +341,9 @@ class vcs implements iVcs {
$oCache->delete(); $oCache->delete();
$this->_aRemoteBranches = []; $this->_aRemoteBranches = [];
} }
} else {
// use cache that getCommitmessageByBranch can access it
$this->_aRemoteBranches = $oCache->read();
} }
return $this->_aRemoteBranches; return $this->_aRemoteBranches;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment