opendev/gerrit
Code Issues Proposed changes

ReceiveCommits.ReplaceRequest: Parse prior commit body earlier

Browse Source 
In I4768e35b, PatchSetUtil.getChangeKind was added, which depends on
the body of both commits being parsed.

Change-Id: Ia9d09b154988becb2802418a35b4b2edccb58284
This commit is contained in:
Dave Borowitz
2013-10-01 10:31:21 -07:00
parent ffc633f72e
commit eeb44d41d0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
View File

@@ -1684,12 +1684,12 @@ public class ReceiveCommits {
if (!validCommit(changeCtl.getRefControl(), inputCommand, newCommit)) { if (!validCommit(changeCtl.getRefControl(), inputCommand, newCommit)) {
return false; return false;
} }
rp.getRevWalk().parseBody(priorCommit);
// Don't allow the same tree if the commit message is unmodified // Don't allow the same tree if the commit message is unmodified
// or no parents were updated (rebase), else warn that only part // or no parents were updated (rebase), else warn that only part
// of the commit was modified. // of the commit was modified.
if (newCommit.getTree() == priorCommit.getTree()) { if (newCommit.getTree() == priorCommit.getTree()) {
rp.getRevWalk().parseBody(priorCommit);
final boolean messageEq = final boolean messageEq =
eq(newCommit.getFullMessage(), priorCommit.getFullMessage()); eq(newCommit.getFullMessage(), priorCommit.getFullMessage());
final boolean parentsEq = parentsEqual(newCommit, priorCommit); final boolean parentsEq = parentsEqual(newCommit, priorCommit);