From 8bbd6e423d3913dcb7de1deefa1c02cdde9d7b40 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <aleksey.pivovarov@jetbrains.com>
Date: Tue, 28 Jun 2016 14:47:18 +0300
Subject: [PATCH] git: cleanup

---
 .../src/git4idea/history/GitHistoryUtils.java | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
index 9f73dac013bf..92b1db5f6977 100644
--- a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
+++ b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
@@ -657,21 +657,31 @@ public class GitHistoryUtils {
 
     @Nullable
     public GitLogRecord acceptLine(String s) {
-      final boolean lineEnd = s.startsWith(GitLogParser.RECORD_START);
-      if (lineEnd && (!myNotStarted)) {
+      final boolean recordStart = s.startsWith(GitLogParser.RECORD_START);
+      if (recordStart) {
+        s = s.substring(GitLogParser.RECORD_START.length());
+      }
+
+      if (myNotStarted) {
+        myBuffer.append(s);
+        myBuffer.append("\n");
+
+        myNotStarted = false;
+        return null;
+      }
+      else if (recordStart) {
         final String line = myBuffer.toString();
         myBuffer.setLength(0);
-        myBuffer.append(s.substring(GitLogParser.RECORD_START.length()));
+
+        myBuffer.append(s);
 
         return processResult(line);
       }
       else {
-        myBuffer.append(lineEnd ? s.substring(GitLogParser.RECORD_START.length()) : s);
+        myBuffer.append(s);
         myBuffer.append("\n");
+        return null;
       }
-      myNotStarted = false;
-
-      return null;
     }
 
     public GitLogRecord processLast() {