commit 5d33f73866f7d45adef672fb75653b9af8837c62
author Kenny Ho <y2kenny@gmail.com> Wed Nov 14 18:09:51 2018 -0500
committer Kenny Ho <y2kenny@gmail.com> Thu Nov 15 00:08:14 2018 +0000
tree abd1455f39f2919bb010f1ac4e81bcda713b0cd4
parent 48827f691680b52064b050754096afc49443e734

Filter MERGE_LIST magic file from Prolog facts

MERGE_LIST is magic file just like COMMIT_MSG.  Using the general
isMagic function to filter out the paths.

Change-Id: I4799817d24f770f0e76874b499de653b970320e4

java/gerrit/PRED_commit_delta_4.java

diff --git a/java/gerrit/PRED_commit_delta_4.java b/java/gerrit/PRED_commit_delta_4.java
index 7c26632..d2634ea 100644
--- a/java/gerrit/PRED_commit_delta_4.java
+++ b/java/gerrit/PRED_commit_delta_4.java
@@ -102,7 +102,7 @@
         String oldName = patch.getOldName();
         Patch.ChangeType changeType = patch.getChangeType();
 
-        if (newName.equals("/COMMIT_MSG")) {
+        if (Patch.isMagic(newName)) {
           continue;
         }
 

java/gerrit/PRED_commit_edits_2.java

diff --git a/java/gerrit/PRED_commit_edits_2.java b/java/gerrit/PRED_commit_edits_2.java
index c196026..f46a6487 100644
--- a/java/gerrit/PRED_commit_edits_2.java
+++ b/java/gerrit/PRED_commit_edits_2.java
@@ -14,6 +14,7 @@
 
 package gerrit;
 
+import com.google.gerrit.reviewdb.client.Patch;
 import com.google.gerrit.server.patch.PatchList;
 import com.google.gerrit.server.patch.PatchListEntry;
 import com.google.gerrit.server.patch.Text;
@@ -90,7 +91,7 @@
         String newName = entry.getNewName();
         String oldName = entry.getOldName();
 
-        if (newName.equals("/COMMIT_MSG")) {
+        if (Patch.isMagic(newName)) {
           continue;
         }