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

Fixing issue with indefero repo and removing registration key

Browse Source
This commit is contained in:
Nathan Adams
2013-07-27 19:17:56 -05:00
parent 42a3fd82bb
commit ef58d4135f
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indefero/src/IDF/Scm/Git.php
View File

@@ -74,9 +74,11 @@ class IDF_Scm_Git extends IDF_Scm
foreach ($out as $line) {
$line = trim($line);
if ($line != '') {
$action = $line[0];
#echo "line = " . $line . "\n";
#echo "action = " . $action;
if ($action == 'A') {
$filename = trim(substr($line, 1));
$return->additions[] = $filename;
@@ -87,8 +89,19 @@ class IDF_Scm_Git extends IDF_Scm
$filename = trim(substr($line, 1));
$return->patches[] = $filename;
} else if ($action == 'R') {
// This patch is needed because it seems
// that under a merge git may show a status
// of RC and not say the location of the original file
$matches = preg_split("/\t/", $line);
$return->renames[$matches[1]] = $matches[2];
if (count($matches) != 3)
{
$return->additions[] = $matches[1];
}
else
{
$return->renames[$matches[1]] = $matches[2];
}
} else if ($action == 'C') {
$matches = preg_split("/\t/", $line);
$return->copies[$matches[1]] = $matches[2];