X-Git-Url: http://git.pk910.de/?p=GITManagedWebpage.git;a=blobdiff_plain;f=GITManagedWebpage.class.php;h=5b15d8cbf32293e6209683935ce3756d0628e306;hp=3a76edcec7cca0f9722b56633d86dd92f339c5f5;hb=33287094dd6fb43d7329c0f06507db63afbbc35b;hpb=8cf9a297093dc6b064c0ea48ea2d85ae865f4463

diff --git a/GITManagedWebpage.class.php b/GITManagedWebpage.class.php
index 3a76edc..5b15d8c 100644
--- a/GITManagedWebpage.class.php
+++ b/GITManagedWebpage.class.php
@@ -218,7 +218,7 @@ class GITManagedWebpage {
         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) {
@@ -290,8 +290,12 @@ class GITManagedWebpage {
         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)) {