From b94bda6597c265ffe3ee8e92311432ce652781e1 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Tue, 3 Nov 2009 17:01:52 +0300
Subject: [PATCH] IDEA-25295 (NPE on integrating change into branch)

---
 .../src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
index c830503bca..84e44c1031 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
@@ -234,7 +234,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
     if (comment != null) {
       setCommitMessage(comment);
       myLastKnownComment = comment;
-      myLastSelectedListName = initialSelection.getName();
+      myLastSelectedListName = initialSelection == null ? null : initialSelection.getName();
     } else {
       setCommitMessage(VcsConfiguration.getInstance(project).LAST_COMMIT_MESSAGE);
       updateComment();
-- 
2.11.4.GIT