Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-05-24 02:08:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed merge bug

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-08-20 14:14:48 +02:00
parent a7e337b153
commit 5f8949cba6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Utils/Git/Repository.php
View File

@ -853,6 +853,10 @@ class Repository
throw new \Exception('Invalid commit id'); throw new \Exception('Invalid commit id');
} }
if(StringUtils::startsWith($lines[1], 'Merge')) {
return new Commit();
}
// todo: validate if array values are all initialized // todo: validate if array values are all initialized
$author = explode(':', $lines[1]); $author = explode(':', $lines[1]);
$author = explode('<', trim($author[1])); $author = explode('<', trim($author[1]));