From 2e27b2c76bd497b66b66d0e379fb3404d875931b Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 30 Jul 2012 16:13:45 +0400
Subject: [PATCH] [git] history: fix status information expectations.

It can safely be null, for example, for merge commits without any changes.
---
 plugins/git4idea/src/git4idea/history/GitHistoryUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
index 291c32116b78..cf2d93c9a57b 100644
--- a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
+++ b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
@@ -372,8 +372,8 @@ public class GitHistoryUtils {
                                                new Date(record.getAuthorTimeStamp() * 1000), false, parents));
           List<GitLogStatusInfo> statusInfos = record.getStatusInfos();
           if (statusInfos.isEmpty()) {
-            LOG.error(String.format("No status information for the file. File path: %s, current revision: %s, log record: %s",
-                                    currentPath, revision, record));
+            // can safely be empty, for example, for simple merge commits that don't change anything.
+            return;
           }
           if (statusInfos.get(0).getType() == GitChangeType.ADDED) {
             skipFurtherOutput.set(true);