opendev/gerrit
Code Issues Proposed changes

Merge "Add Change-Id on cherry-picked commits"

Browse Source
This commit is contained in:
Shawn Pearce
2013-09-21 06:01:02 +00:00
committed by Gerrit Code Review
parent 27f7c1cc69 b053345243
commit 00a399d14e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java
View File

@@ -129,13 +129,19 @@ public class CherryPickChange {
currentUser.newCommitterIdent(myIdent.getWhen(), currentUser.newCommitterIdent(myIdent.getWhen(),
myIdent.getTimeZone()); myIdent.getTimeZone());
final ObjectId computedChangeId =
ChangeIdUtil
.computeChangeId(commitToCherryPick.getTree(), mergeTip,
commitToCherryPick.getAuthorIdent(), myIdent, message);
String commitMessage = ChangeIdUtil.insertId(message, computedChangeId);
RevCommit cherryPickCommit; RevCommit cherryPickCommit;
ObjectInserter oi = git.newObjectInserter(); ObjectInserter oi = git.newObjectInserter();
try { try {
ProjectState projectState = refControl.getProjectControl().getProjectState(); ProjectState projectState = refControl.getProjectControl().getProjectState();
cherryPickCommit = cherryPickCommit =
mergeUtilFactory.create(projectState).createCherryPickFromCommit(git, oi, mergeTip, mergeUtilFactory.create(projectState).createCherryPickFromCommit(git, oi, mergeTip,
commitToCherryPick, committerIdent, message, revWalk); commitToCherryPick, committerIdent, commitMessage, revWalk);
} finally { } finally {
oi.release(); oi.release();
} }
@@ -151,11 +157,6 @@ public class CherryPickChange {
final String idStr = idList.get(idList.size() - 1).trim(); final String idStr = idList.get(idList.size() - 1).trim();
changeKey = new Change.Key(idStr); changeKey = new Change.Key(idStr);
} else { } else {
final ObjectId computedChangeId =
ChangeIdUtil
.computeChangeId(cherryPickCommit.getTree(), mergeTip,
cherryPickCommit.getAuthorIdent(), myIdent, message);
changeKey = new Change.Key("I" + computedChangeId.name()); changeKey = new Change.Key("I" + computedChangeId.name());
} }