From 933cdf59660ebafa679a45fefa75133bad23fb8c Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Tue, 3 Nov 2015 09:54:20 -0800 Subject: [PATCH] Rebase: Use committer identity in new commit The RefLogIdent should only be used in RefLogs. Never in long term commit objects. Change-Id: Ib32dec5ad463b23b4e967b503dacc4643daec673 --- .../java/com/google/gerrit/server/change/RebaseChangeOp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java index 6769a5c87e..933ac737bd 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java @@ -199,7 +199,7 @@ public class RebaseChangeOp extends BatchUpdate.Op { cb.setCommitter(committerIdent); } else { cb.setCommitter(ctx.getUser().asIdentifiedUser() - .newRefLogIdent(ctx.getWhen(), ctx.getTimeZone())); + .newCommitterIdent(ctx.getWhen(), ctx.getTimeZone())); } ObjectId objectId = ctx.getInserter().insert(cb); ctx.getInserter().flush();