From 5f8949cba68efb10198cd0ad5501ef8ba77c832b Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 20 Aug 2016 14:14:48 +0200
Subject: [PATCH] Fixed merge bug

---
 Utils/Git/Repository.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Utils/Git/Repository.php b/Utils/Git/Repository.php
index f8d75ab4e..335f0e73b 100644
--- a/Utils/Git/Repository.php
+++ b/Utils/Git/Repository.php
@@ -853,6 +853,10 @@ class Repository
             throw new \Exception('Invalid commit id');
         }
 
+        if(StringUtils::startsWith($lines[1], 'Merge')) {
+            return new Commit();
+        }
+
         // todo: validate if array values are all initialized
         $author = explode(':', $lines[1]);
         $author = explode('<', trim($author[1]));