diff --git a/src/IDF/Scm.php b/src/IDF/Scm.php index e8c9999..efa8f74 100644 --- a/src/IDF/Scm.php +++ b/src/IDF/Scm.php @@ -343,7 +343,7 @@ class IDF_Scm $key = 'IDF_Scm:'.$project->shortname.':lastsync'; if (null === ($res=$cache->get($key))) { $scm = IDF_Scm::get($project); - foreach ($scm->getBranches() as $branche) { + foreach ($scm->getBranches() as $branche => $path) { foreach ($scm->getChangeLog($branche, 25) as $change) { IDF_Commit::getOrAdd($change, $project); } diff --git a/src/IDF/Scm/Git.php b/src/IDF/Scm/Git.php index 2361b9c..76d7a10 100644 --- a/src/IDF/Scm/Git.php +++ b/src/IDF/Scm/Git.php @@ -437,7 +437,7 @@ class IDF_Scm_Git extends IDF_Scm continue; } } - $c['full_message'] = trim($c['full_message']); + $c['full_message'] = !empty($c['full_message']) ? trim($c['full_message']) : ''; $res[] = (object) $c; return $res; }