From e22b24ee12488d5c42f9928115bfd9bf861b8e19 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 16 Jan 2017 12:45:10 +0300
Subject: [PATCH] git: propose better message for changelist name

Strip consecutive spaces.
Move this replacing before searching for changelists with same name,
which is more logical.
---
 plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java b/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java
index 3126914c2fb5..6401731ff89f 100644
--- a/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java
+++ b/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java
@@ -457,7 +457,8 @@ public class GitCherryPicker extends VcsCherryPicker {
       return null;
     }
 
-    String changeListName = createNameForChangeList(commitMessage, 0).replace('\n', ' ');
+    String adjustedMessage = commitMessage.replace('\n', ' ').replaceAll("[ ]{2,}", " ");
+    String changeListName = createNameForChangeList(adjustedMessage, 0);
     LocalChangeList createdChangeList = ((ChangeListManagerEx)myChangeListManager).addChangeList(changeListName, commitMessage, commit);
     LocalChangeList actualChangeList = moveChanges(originalChanges, createdChangeList);
     if (actualChangeList != null && !actualChangeList.getChanges().isEmpty()) {