From ca55c005b9f4be6aa0d34a00d61607cdb2ecd26f Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Mon, 18 Jul 2016 15:04:07 -0700
Subject: [PATCH] Fix extra period in comment message

This fixes the comment message, which contains an extra period when
pushing a patch set which is either rebased or commit message update.

Bug: Issue 4137
Change-Id: I4291c1f07601adc2250e70e998743ccd8e5a7c4a
---
 .../main/java/com/google/gerrit/server/ApprovalsUtil.java | 2 +-
 .../java/com/google/gerrit/server/git/ReceiveCommits.java | 1 +
 .../main/java/com/google/gerrit/server/git/ReplaceOp.java | 8 +++++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java
index 9bc3949ad4..902a51c790 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java
@@ -351,6 +351,6 @@ public class ApprovalsUtil {
             .append(LabelVote.create(e.getKey(), e.getValue()).format());
       }
     }
-    return msgs.append('.').toString();
+    return msgs.toString();
   }
 }
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 a8c71f5486..ff8a12a87a 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
@@ -1799,6 +1799,7 @@ public class ReceiveCommits {
             ApprovalsUtil.renderMessageWithApprovals(
                 psId.get(), approvals,
                 Collections.<String, PatchSetApproval> emptyMap()));
+        msg.append('.');
         if (!Strings.isNullOrEmpty(magicBranch.message)) {
           msg.append("\n").append(magicBranch.message);
         }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReplaceOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReplaceOp.java
index b012d4d189..2e162b7a32 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReplaceOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReplaceOp.java
@@ -263,10 +263,12 @@ public class ReplaceOp extends BatchUpdate.Op {
 
     String approvalMessage = ApprovalsUtil.renderMessageWithApprovals(
         patchSetId.get(), approvals, scanLabels(ctx, approvals));
-    StringBuilder message = new StringBuilder(approvalMessage);
     String kindMessage = changeKindMessage(changeKind);
+    StringBuilder message = new StringBuilder(approvalMessage);
     if (!Strings.isNullOrEmpty(kindMessage)) {
       message.append(kindMessage);
+    } else {
+      message.append('.');
     }
     if (!Strings.isNullOrEmpty(reviewMessage)) {
       message.append("\n").append(reviewMessage);
@@ -293,9 +295,9 @@ public class ReplaceOp extends BatchUpdate.Op {
       case MERGE_FIRST_PARENT_UPDATE:
       case TRIVIAL_REBASE:
       case NO_CHANGE:
-        return ": Patch Set " + priorPatchSetId.get() + " was rebased";
+        return ": Patch Set " + priorPatchSetId.get() + " was rebased.";
       case NO_CODE_CHANGE:
-        return ": Commit message was updated";
+        return ": Commit message was updated.";
       case REWORK:
       default:
         return null;