Don't show /COMMIT_MSG in change emails

The magical /COMMIT_MSG file that we wedge into the PatchList
in order to support reviewing the message itself shouldn't be
displayed as if it were a file added by the author.

Change-Id: I211a3a41ec7e2a2eff709beb3230cc162f7c095c
Signed-off-by: Shawn O. Pearce <sop@google.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java
index e7c463cc02..87edd6e9f9 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java
@@ -19,6 +19,7 @@ import com.google.gerrit.reviewdb.AccountGroup;
 import com.google.gerrit.reviewdb.AccountProjectWatch;
 import com.google.gerrit.reviewdb.Change;
 import com.google.gerrit.reviewdb.ChangeMessage;
+import com.google.gerrit.reviewdb.Patch;
 import com.google.gerrit.reviewdb.PatchSet;
 import com.google.gerrit.reviewdb.PatchSetApproval;
 import com.google.gerrit.reviewdb.PatchSetInfo;
@@ -291,6 +292,9 @@ public abstract class ChangeEmail extends OutgoingEmail {
     if (patchSet != null) {
       appendText("---\n");
       for (PatchListEntry p : getPatchList().getPatches()) {
+        if (Patch.COMMIT_MSG.equals(p.getNewName())) {
+          continue;
+        }
         appendText(p.getChangeType().getCode() + " " + p.getNewName() + "\n");
       }
       appendText("\n");