MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

git: propose better message for changelist name

Browse Source 
Strip consecutive spaces.
Move this replacing before searching for changelists with same name,
which is more logical.
This commit is contained in:
Kirill Likhodedov
2017-02-07 11:51:07 +00:00
parent a12db512a5
commit e22b24ee12
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java
+2 -1
View File
@@ -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()) {