opendev/gerrit
Code Issues Proposed changes

CreateChange#getCommitMessage: Remove unused parameters and variable

Browse Source 
The merge done in change I666ee4c2c accidentally introduced unused
parameters and an unused variable in the getCommitMessage method.

Change-Id: I25afa4519f2ab2ce5e19387ca7e38fd44247b755
This commit is contained in:
David Pursehouse
2020-02-04 09:50:50 +09:00
parent 5a89a55940
commit baee4e5963
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/com/google/gerrit/server/restapi/change/CreateChange.java
View File

@@ -291,7 +291,7 @@ public class CreateChange
Timestamp now = TimeUtil.nowTs();
PersonIdent author = me.newCommitterIdent(now, serverTimeZone);
String commitMessage = getCommitMessage(input.subject, me, oi, mergeTip, author);
String commitMessage = getCommitMessage(input.subject, me);
RevCommit c;
if (input.merge != null) {
@@ -403,17 +403,10 @@ public class CreateChange
return parentCommit;
}
private String getCommitMessage(
String subject,
IdentifiedUser me,
ObjectInserter objectInserter,
RevCommit mergeTip,
PersonIdent author)
throws IOException {
private String getCommitMessage(String subject, IdentifiedUser me) {
// Add a Change-Id line if there isn't already one
String commitMessage = subject;
if (ChangeIdUtil.indexOfChangeId(commitMessage, "\n") == -1) {
ObjectId treeId = mergeTip == null ? emptyTreeId(objectInserter) : mergeTip.getTree();
ObjectId id = CommitMessageUtil.generateChangeId();
commitMessage = ChangeIdUtil.insertId(commitMessage, id);
}