if($branch == $default_branch)
$dir = $this->localdir;
else
- $dir = $this->workdir.'branch_'.$branch.'/';
+ $dir = $this->workdir.'branch_'.str_replace(array('/'), array('_'), $branch).'/';
if(file_exists($dir))
return $dir;
else if($create) {
if($this->loopedcall)
return;
- if(!$this->branchExists($branch))
- return false;
+ if(!$this->branchExists($branch)) {
+ if($this->branchExists('origin/'.$branch))
+ $branch = 'origin/'.$branch;
+ else
+ return false;
+ }
$this->setActiveBranch($branch, $remember);
if(!$this->localBranchPath($branch)) {