diff options
| author | Shawn O. Pearce <sop@google.com> | 2009-11-02 16:25:23 -0800 |
|---|---|---|
| committer | Shawn O. Pearce <sop@google.com> | 2009-11-02 16:25:29 -0800 |
| commit | 762ad4c1d9f84523c7748b7019556e4049d3ae8c (patch) | |
| tree | 7b544b7cb2f9d97adb408f6844285e78e8e01414 | |
| parent | dbc53b701924844ea0f4f1ba49d3d41b01da1083 (diff) | |
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>
| -rw-r--r-- | src/main/java/com/google/gerrit/server/ssh/commands/Receive.java | 1 |
1 files changed, 1 insertions, 0 deletions
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 e8c38de287..a0ebb169fe 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 @@ final class Receive extends AbstractGitCommand { // 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; |