From eeb44d41d01a645c61e6c24222ca9f1ac882babd Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Tue, 1 Oct 2013 10:31:21 -0700 Subject: [PATCH] ReceiveCommits.ReplaceRequest: Parse prior commit body earlier In I4768e35b, PatchSetUtil.getChangeKind was added, which depends on the body of both commits being parsed. Change-Id: Ia9d09b154988becb2802418a35b4b2edccb58284 --- .../main/java/com/google/gerrit/server/git/ReceiveCommits.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java index 95f06165e2..0f4c9d1de7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java @@ -1684,12 +1684,12 @@ public class ReceiveCommits { if (!validCommit(changeCtl.getRefControl(), inputCommand, newCommit)) { return false; } + rp.getRevWalk().parseBody(priorCommit); // Don't allow the same tree if the commit message is unmodified // or no parents were updated (rebase), else warn that only part // of the commit was modified. if (newCommit.getTree() == priorCommit.getTree()) { - rp.getRevWalk().parseBody(priorCommit); final boolean messageEq = eq(newCommit.getFullMessage(), priorCommit.getFullMessage()); final boolean parentsEq = parentsEqual(newCommit, priorCommit);