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

Fixed issue 94, commands have changed in git 1.6.

Browse Source
This commit is contained in:
Loic d'Anterroches 2008-12-23 22:43:09 +01:00
parent 0a02916e81
commit e6b19a695b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,7 +171,7 @@ class IDF_Scm_Git
if ('tree' != $this->testHash($tree)) { if ('tree' != $this->testHash($tree)) {
throw new Exception(sprintf(__('Not a valid tree: %s.'), $tree)); throw new Exception(sprintf(__('Not a valid tree: %s.'), $tree));
} }
$cmd_tmpl = 'GIT_DIR=%s git-ls-tree%s -t -l %s'; $cmd_tmpl = 'GIT_DIR=%s git ls-tree%s -t -l %s';
$cmd = sprintf($cmd_tmpl, $cmd = sprintf($cmd_tmpl,
escapeshellarg($this->repo), escapeshellarg($this->repo),
($recurse) ? ' -r' : '', ($recurse) ? ' -r' : '',
@ -198,7 +198,7 @@ class IDF_Scm_Git
*/ */
public function getFileInfo($totest, $commit='HEAD') public function getFileInfo($totest, $commit='HEAD')
{ {
$cmd_tmpl = 'GIT_DIR=%s git-ls-tree -r -t -l %s'; $cmd_tmpl = 'GIT_DIR=%s git ls-tree -r -t -l %s';
$cmd = sprintf($cmd_tmpl, $cmd = sprintf($cmd_tmpl,
escapeshellarg($this->repo), escapeshellarg($this->repo),
escapeshellarg($commit)); escapeshellarg($commit));
@ -224,7 +224,7 @@ class IDF_Scm_Git
*/ */
public function getBlob($request_file_info, $dummy=null) public function getBlob($request_file_info, $dummy=null)
{ {
return shell_exec(sprintf('GIT_DIR=%s git-cat-file blob %s', return shell_exec(sprintf('GIT_DIR=%s git cat-file blob %s',
escapeshellarg($this->repo), escapeshellarg($this->repo),
escapeshellarg($request_file_info->hash))); escapeshellarg($request_file_info->hash)));
} }