From 98f649ebcc1dfa9db38cdba833070ef8cb55e5cc Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Fri, 27 Nov 2009 14:40:18 +0300
Subject: [PATCH] Apply patch | show diff -> NPE in case of git patch

---
 .../openapi/vcs/changes/actions/ChangeDiffRequestPresentable.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ChangeDiffRequestPresentable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ChangeDiffRequestPresentable.java
index 75af380ab2..2061bbc82f 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ChangeDiffRequestPresentable.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ChangeDiffRequestPresentable.java
@@ -98,10 +98,10 @@ public class ChangeDiffRequestPresentable implements DiffRequestPresentable {
 
     String beforeRevisionTitle = (bRev != null) ? bRev.getRevisionNumber().asString() : "";
     String afterRevisionTitle = (aRev != null) ? aRev.getRevisionNumber().asString() : "";
-    if (beforeRevisionTitle.length() == 0) {
+    if ((beforeRevisionTitle == null) || (beforeRevisionTitle.length() == 0)) {
       beforeRevisionTitle = "Base version";
     }
-    if (afterRevisionTitle.length() == 0) {
+    if ((afterRevisionTitle == null) || (afterRevisionTitle.length() == 0)) {
       afterRevisionTitle = "Your version";
     }
     request.setContentTitles(beforeRevisionTitle, afterRevisionTitle);
-- 
2.11.4.GIT