commit 762ad4c1d9f84523c7748b7019556e4049d3ae8c
author Shawn O. Pearce <sop@google.com> Mon Nov 02 16:25:23 2009 -0800
committer Shawn O. Pearce <sop@google.com> Mon Nov 02 16:25:29 2009 -0800
tree 7b544b7cb2f9d97adb408f6844285e78e8e01414
parent dbc53b701924844ea0f4f1ba49d3d41b01da1083

Ensure prior commit body is parsed before comparing messages

Otherwise we NPE when we try to replace a patch.

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

src/main/java/com/google/gerrit/server/ssh/commands/Receive.java

diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/Receive.java b/src/main/java/com/google/gerrit/server/ssh/commands/Receive.java
index e8c38de..a0ebb16 100644
--- a/src/main/java/com/google/gerrit/server/ssh/commands/Receive.java
+++ b/src/main/java/com/google/gerrit/server/ssh/commands/Receive.java
@@ -990,6 +990,7 @@
             //
             if (priorPatchSet.equals(ps.getId())
                 && c.getTree() == prior.getTree()) {
+              rp.getRevWalk().parseBody(prior);
               if (c.getFullMessage().equals(prior.getFullMessage())) {
                 reject(request.cmd, "no changes made");
                 return null;