commit faa1669ceca21b4c7a0de5021663081770c16041
author Edwin Kempin <ekempin@google.com> Wed Oct 07 10:47:29 2020 +0200
committer Edwin Kempin <ekempin@google.com> Wed Oct 07 10:47:44 2020 +0200
tree 0dcad72bde5075836f03bb6660722b0e024009df
parent ffaeb8cc66436e0afddc6d4ae2bfc26f8e66bcd1

Adapt to change in Gerrit core

Change Id93e378be changed the signature of
MergeValidationListener#onPreMerge.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ia8bfcbeeeff837c3dec6a9feefcfc3fd1e48e932

java/com/google/gerrit/plugins/checks/CheckerMergeValidator.java

diff --git a/java/com/google/gerrit/plugins/checks/CheckerMergeValidator.java b/java/com/google/gerrit/plugins/checks/CheckerMergeValidator.java
index 1df2759..0e454eb 100644
--- a/java/com/google/gerrit/plugins/checks/CheckerMergeValidator.java
+++ b/java/com/google/gerrit/plugins/checks/CheckerMergeValidator.java
@@ -19,6 +19,7 @@
 import com.google.gerrit.server.IdentifiedUser;
 import com.google.gerrit.server.config.AllProjectsName;
 import com.google.gerrit.server.git.CodeReviewCommit;
+import com.google.gerrit.server.git.CodeReviewCommit.CodeReviewRevWalk;
 import com.google.gerrit.server.git.validators.MergeValidationException;
 import com.google.gerrit.server.git.validators.MergeValidationListener;
 import com.google.gerrit.server.project.ProjectState;
@@ -37,6 +38,7 @@
   @Override
   public void onPreMerge(
       Repository repo,
+      CodeReviewRevWalk revWalk,
       CodeReviewCommit commit,
       ProjectState destProject,
       BranchNameKey destBranch,