From daea4504c075aae54d1e70139293eadb11097b0e Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Mon, 26 Nov 2012 11:25:50 +0900
Subject: [PATCH] Fix: Editing the commit message causes other files to be
 removed

If the commit message is edited from the UI, a new patch set is
created, but it does not contain any of the files that were in
the change.

This is because when the commit message is edited, the parent
revision of the newly created patch set is set to the revision of
the patch set that was edited.  This is wrong, it should be set to
the edited patch set's parent.

Change-Id: I7874024dcc7c228c94b7332a857554309c3cb9e0
---
 .../src/main/java/com/google/gerrit/server/ChangeUtil.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
index 54bfe60d7a..132a4997a2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
@@ -340,8 +340,8 @@ public class ChangeUtil {
             user.newCommitterIdent(myIdent.getWhen(), myIdent.getTimeZone());
 
         CommitBuilder commitBuilder = new CommitBuilder();
-        commitBuilder.addParentId(commit);
         commitBuilder.setTreeId(commit.getTree());
+        commitBuilder.setParentIds(commit.getParents());
         commitBuilder.setAuthor(authorIdent);
         commitBuilder.setCommitter(myIdent);
         commitBuilder.setMessage(message);