natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix issue 629 : Git commit view is missing the branch

Browse Source
This commit is contained in:
William MARTIN 2011-03-11 11:38:04 +01:00
parent 2648603f24
commit bb4fa7ca2f
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/IDF/Scm/Git.php
View File

@ -167,7 +167,29 @@ class IDF_Scm_Git extends IDF_Scm
*/
public function inBranches($commit, $path)
{
return $this->_inObject($commit, 'branch');
if (isset($this->cache['inBranches'][$commit])) {
return $this->cache['inBranches'][$commit];
}
$cmd = Pluf::f('idf_exec_cmd_prefix', '')
.sprintf('GIT_DIR=%s %s branch --contains %s',
escapeshellarg($this->repo),
Pluf::f('git_path', 'git'),
escapeshellarg($commit));
self::exec('IDF_Scm_Git::inBranches', $cmd, $out, $return);
if (0 != $return) {
throw new IDF_Scm_Exception(sprintf($this->error_tpl,
$cmd, $return,
implode("\n", $out)));
}
$res = array();
foreach ($out as $line) {
$res[] = substr($line, 2);
}
$this->cache['inBranches'][$commit] = $res;
return $res;
}
/**