Merge "Add newline on commit messages cherry-picked from UI and REST API" into stable-2.8

This commit is contained in:
Shawn Pearce
2014-02-10 16:08:20 +00:00
committed by Gerrit Code Review

View File

@@ -134,7 +134,8 @@ public class CherryPickChange {
ChangeIdUtil
.computeChangeId(commitToCherryPick.getTree(), mergeTip,
commitToCherryPick.getAuthorIdent(), myIdent, message);
String commitMessage = ChangeIdUtil.insertId(message, computedChangeId);
String commitMessage =
ChangeIdUtil.insertId(message, computedChangeId).trim() + '\n';
RevCommit cherryPickCommit;
ObjectInserter oi = git.newObjectInserter();