projects
/
GITManagedWebpage.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed last commit
[GITManagedWebpage.git]
/
GITManagedWebpage.class.php
diff --git
a/GITManagedWebpage.class.php
b/GITManagedWebpage.class.php
index 0cf408ce4bc1550134e1b9ca2908bc86ff820c8e..2c429f96ed1a047e76a7f5c0f42739f078984cd9 100644
(file)
--- a/
GITManagedWebpage.class.php
+++ b/
GITManagedWebpage.class.php
@@
-90,7
+90,7
@@
class GITManagedWebpage {
} else
$argstr .= " ".escapeshellarg($arg);
}
} else
$argstr .= " ".escapeshellarg($arg);
}
- $gitcmd = 'git '.escapeshellarg('--git-dir='.$this->workdir.'repository/.git').$argstr;
+ $gitcmd = 'git '.escapeshellarg('--git-dir='.$this->workdir.'repository/.git').
' '.escapeshellarg('--work-tree='.$this->workdir.'repository').
$argstr;
$output = shell_exec($gitcmd);
return $output;
}
$output = shell_exec($gitcmd);
return $output;
}
@@
-218,7
+218,7
@@
class GITManagedWebpage {
if($branch == $default_branch)
$dir = $this->localdir;
else
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(file_exists($dir))
return $dir;
else if($create) {
@@
-241,7
+241,6
@@
class GITManagedWebpage {
$deleted_files = array();
if(($current_version = $this->getConfig('version_'.$branch))) {
$deleted_files = array();
if(($current_version = $this->getConfig('version_'.$branch))) {
- echo $current_version . " == " . $newest_version;
if($current_version == $newest_version)
return;
else {
if($current_version == $newest_version)
return;
else {
@@
-291,8
+290,10
@@
class GITManagedWebpage {
if($this->loopedcall)
return;
if($this->loopedcall)
return;
- if(!$this->branchExists($branch))
- return false;
+ if(!$this->branchExists($branch)) {
+ if(!$this->branchExists('origin/'.$branch))
+ return false;
+ }
$this->setActiveBranch($branch, $remember);
if(!$this->localBranchPath($branch)) {
$this->setActiveBranch($branch, $remember);
if(!$this->localBranchPath($branch)) {
@@
-319,8
+320,7
@@
class GITManagedWebpage {
$this->updateBranch($active_branch, $dir);
}
include_once($dir.$file);
$this->updateBranch($active_branch, $dir);
}
include_once($dir.$file);
- } else {
- include_once($this->localdir.$file);
+ die();
}
}
}
}