diff --git a/src/GitList/Git/Repository.php b/src/GitList/Git/Repository.php index 65db976..2566ae3 100644 --- a/src/GitList/Git/Repository.php +++ b/src/GitList/Git/Repository.php @@ -52,11 +52,11 @@ class Repository extends BaseRepository . "" . "\" $commitHash" ); + $xmlEnd = strpos($logs, '') + 7; $commitInfo = substr($logs, 0, $xmlEnd); $commitData = substr($logs, $xmlEnd); $logs = explode("\n", $commitData); - array_shift($logs); // Read commit metadata $format = new PrettyFormat; @@ -67,8 +67,6 @@ class Repository extends BaseRepository if ($commit->getParentsHash()) { $command = 'diff ' . $commitHash . '~1..' . $commitHash; $logs = explode("\n", $this->getClient()->run($this, $command)); - } else { - $logs = array_slice($logs, 1); } $commit->setDiffs($this->readDiffLogs($logs)); @@ -126,6 +124,11 @@ class Repository extends BaseRepository $lineNumOld = 0; $lineNumNew = 0; foreach ($logs as $log) { + # Skip empty lines + if ($log == "") { + continue; + } + if ('diff' === substr($log, 0, 4)) { if (isset($diff)) { $diffs[] = $diff;