commit 9eb4f2653cf8934af9179d4ecc4712255aaf801d
author Dave Borowitz <dborowitz@google.com> Tue Dec 04 15:32:07 2018 -0800
committer Dave Borowitz <dborowitz@google.com> Tue Dec 04 15:33:40 2018 -0800
tree eef949cb3f7a2dc3c5e981f6999fb877007c45c0
parent 99926324de86233981dd66cc9a9698aa98f278c2

ReceiveCommits: Parse body before accessing full commit message

Change-Id: I49e57e82e8d7de941a0e2e6a827cda1a2aa303eb

java/com/google/gerrit/server/git/receive/ReceiveCommits.java

diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
index c747533..c3fb4bc 100644
--- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
+++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
@@ -2725,10 +2725,13 @@
 
     /** prints a warning if the new PS has the same tree as the previous commit. */
     private void sameTreeWarning() throws IOException {
-      RevCommit newCommit = receivePack.getRevWalk().parseCommit(newCommitId);
+      RevWalk rw = receivePack.getRevWalk();
+      RevCommit newCommit = rw.parseCommit(newCommitId);
       RevCommit priorCommit = revisions.inverse().get(priorPatchSet);
 
       if (newCommit.getTree().equals(priorCommit.getTree())) {
+        rw.parseBody(newCommit);
+        rw.parseBody(priorCommit);
         boolean messageEq =
             Objects.equals(newCommit.getFullMessage(), priorCommit.getFullMessage());
         boolean parentsEq = parentsEqual(newCommit, priorCommit);