Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
Submit: Get the change Id from the patch set Id
Change-Id: I3355bf0208389c92cfbeac4bda1926e7fe8d1265
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/Submit.java b/src/main/java/com/googlesource/gerrit/plugins/hooks/Submit.java
index 2892b04..4d87287 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/Submit.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/hooks/Submit.java
@@ -15,7 +15,6 @@
package com.googlesource.gerrit.plugins.hooks;
import com.google.gerrit.reviewdb.client.Branch;
-import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.git.CodeReviewCommit;
@@ -43,14 +42,13 @@
CodeReviewCommit commit,
ProjectState destProject,
Branch.NameKey destBranch,
- Change.Id changeId,
PatchSet.Id patchSetId,
IdentifiedUser caller)
throws MergeValidationException {
String projectName = destProject.getProject().getName();
HookArgs args = hookFactory.createArgs();
- args.add("--change", changeId.get());
+ args.add("--change", patchSetId.changeId.get());
args.add("--project", projectName);
args.add("--branch", destBranch.get());
args.add("--submitter", caller.getNameEmail());
