} 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/.git').$argstr;
$output = shell_exec($gitcmd);
return $output;
}
$current_branch = str_replace(array("\r", "\n"), array("", ""), $this->gitcmd("rev-parse", "--abbrev-ref", "HEAD"));
if($current_branch != $branch)
$this->gitcmd("checkout", $branch);
- $this->gitcmd("pull");
+ echo $this->gitcmd("pull");
$gitret = $this->gitcmd("rev-list", "--max-count=1", $branch);
preg_match("#([a-z0-9]{40})#", $gitret, $match);
$newest_version = $match[1];
$deleted_files = array();
if(($current_version = $this->getConfig('version_'.$branch))) {
- echo $current_version . " == " . $newest_version;
if($current_version == $newest_version)
return;
else {