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] cherry-pick: use single \n between description and "cherry-picked from...", since Git itself does so.

Browse Source
This commit is contained in:
Kirill Likhodedov
2013-01-02 17:23:22 +04:00
parent 109f50685b
commit 1bfa01e0f0
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
+1 -12
View File
@@ -226,18 +226,7 @@ public class GitCherryPicker {
@NotNull
private static String createCommitMessage(@NotNull GitCommit commit) {
// make sure there is an empty line after description
String spaces;
if (commit.getDescription().endsWith("\n\n")) {
spaces = "";
}
else if (commit.getDescription().endsWith("\n")) {
spaces = "\n";
}
else {
spaces = "\n\n";
}
return commit.getDescription() + spaces + "(cherry-picked from " + commit.getShortHash().getString() + ")";
return commit.getDescription() + "\n(cherry-picked from " + commit.getShortHash().getString() + ")";
}
private boolean showCommitDialogAndWaitForCommit(@NotNull final GitRepository repository, @NotNull final GitCommitWrapper commit,