From c33e32e0bae8445627f92aebdb66b373023f92f7 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Wed, 13 Apr 2016 09:11:14 +0200 Subject: [PATCH] Fix subject for "Updated Changes" lines on push When a change was updated it showed the subject from the previous patch set and not as expected the subject from the new current patch set. Bug: Issue 4055 Change-Id: I33d1912cccea795fc003a07bc88800c536c301da Signed-off-by: Edwin Kempin --- .../com/google/gerrit/server/git/ReceiveCommits.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 c6a5931e17..a8ce68c7ac 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 @@ -696,7 +696,8 @@ public class ReceiveCommits { addMessage(""); addMessage("New Changes:"); for (CreateRequest c : created) { - addMessage(formatChangeUrl(canonicalWebUrl, c.change, false)); + addMessage(formatChangeUrl(canonicalWebUrl, c.change, + c.change.getSubject(), false)); } addMessage(""); } @@ -721,20 +722,21 @@ public class ReceiveCommits { addMessage("Updated Changes:"); boolean edit = magicBranch != null && magicBranch.edit; for (ReplaceRequest u : updated) { - addMessage(formatChangeUrl(canonicalWebUrl, u.change, edit)); + addMessage(formatChangeUrl(canonicalWebUrl, u.change, + u.info.getSubject(), edit)); } addMessage(""); } } private static String formatChangeUrl(String url, Change change, - boolean edit) { + String subject, boolean edit) { StringBuilder m = new StringBuilder() .append(" ") .append(url) .append(change.getChangeId()) .append(" ") - .append(ChangeUtil.cropSubject(change.getSubject())); + .append(ChangeUtil.cropSubject(subject)); if (change.getStatus() == Change.Status.DRAFT) { m.append(" [DRAFT]"); }