diff options
author | David Pursehouse <dpursehouse@collab.net> | 2020-02-04 09:50:50 +0900 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2020-02-04 09:50:50 +0900 |
commit | baee4e5963ef7308d4f2651b51e94f5ef8eaf209 (patch) | |
tree | ebed40a0d2a27654e33812cf70375f58f3a21908 | |
parent | 5a89a5594069442994dee59b021a37b525c5521b (diff) |
CreateChange#getCommitMessage: Remove unused parameters and variable
The merge done in change I666ee4c2c accidentally introduced unused
parameters and an unused variable in the getCommitMessage method.
Change-Id: I25afa4519f2ab2ce5e19387ca7e38fd44247b755
-rw-r--r-- | java/com/google/gerrit/server/restapi/change/CreateChange.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/java/com/google/gerrit/server/restapi/change/CreateChange.java b/java/com/google/gerrit/server/restapi/change/CreateChange.java index d22bd0cd5f..f626db2e68 100644 --- a/java/com/google/gerrit/server/restapi/change/CreateChange.java +++ b/java/com/google/gerrit/server/restapi/change/CreateChange.java @@ -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); } |