diff options
| author | Kenny Ho <y2kenny@gmail.com> | 2018-11-14 18:09:51 -0500 |
|---|---|---|
| committer | Kenny Ho <y2kenny@gmail.com> | 2018-11-15 00:08:14 +0000 |
| commit | 5d33f73866f7d45adef672fb75653b9af8837c62 (patch) | |
| tree | abd1455f39f2919bb010f1ac4e81bcda713b0cd4 | |
| parent | 48827f691680b52064b050754096afc49443e734 (diff) | |
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
| -rw-r--r-- | java/gerrit/PRED_commit_delta_4.java | 2 | ||||
| -rw-r--r-- | java/gerrit/PRED_commit_edits_2.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/java/gerrit/PRED_commit_delta_4.java b/java/gerrit/PRED_commit_delta_4.java index 7c26632511..d2634ea81a 100644 --- a/java/gerrit/PRED_commit_delta_4.java +++ b/java/gerrit/PRED_commit_delta_4.java @@ -102,7 +102,7 @@ public class PRED_commit_delta_4 extends Predicate.P4 { String oldName = patch.getOldName(); Patch.ChangeType changeType = patch.getChangeType(); - if (newName.equals("/COMMIT_MSG")) { + if (Patch.isMagic(newName)) { continue; } diff --git a/java/gerrit/PRED_commit_edits_2.java b/java/gerrit/PRED_commit_edits_2.java index c19602661b..f46a6487f0 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 @@ public class PRED_commit_edits_2 extends Predicate.P2 { String newName = entry.getNewName(); String oldName = entry.getOldName(); - if (newName.equals("/COMMIT_MSG")) { + if (Patch.isMagic(newName)) { continue; } |