From 758d331e6966b18c32ae80f5c70fe2170c5cd768 Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Mon, 27 Mar 2017 10:55:47 -0400
Subject: [PATCH] Fixes parsing issue with merge commits

---
 src/git/parsers/logParser.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/git/parsers/logParser.ts b/src/git/parsers/logParser.ts
index 7158055..ff54227 100644
--- a/src/git/parsers/logParser.ts
+++ b/src/git/parsers/logParser.ts
@@ -82,7 +82,13 @@ export class GitLogParser {
                 case 'summary':
                     entry.summary = lineParts.slice(1).join(' ').trim();
                     while (++position < lines.length) {
-                        if (!lines[position]) break;
+                        const next = lines[position];
+                        if (!next) break;
+                        if (next === 'filename ?') {
+                            position--;
+                            break;
+                        }
+
                         entry.summary += `\n${lines[position]}`;
                     }
                     break;