From 817533fae03cd2a0a2a9985c6db219aadb7c6375 Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Mon, 27 Jan 2014 19:12:44 +0900
Subject: [PATCH] Only add "cherry picked from" when cherry picking a merged
 change

The "cherry picked from commit ..." line is added on the commit
message when cherry picking a closed change.  This includes changes
that are abandoned.

Only include the line when cherry picking a merged change.

Change-Id: Iab590e852a530ff54f3c1592ba9f60aefa861f36
---
 .../java/com/google/gerrit/client/change/CherryPickAction.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CherryPickAction.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CherryPickAction.java
index 0dc155e537..10d72979ad 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CherryPickAction.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CherryPickAction.java
@@ -21,6 +21,7 @@ import com.google.gerrit.client.changes.Util;
 import com.google.gerrit.client.rpc.GerritCallback;
 import com.google.gerrit.client.ui.CherryPickDialog;
 import com.google.gerrit.common.PageLinks;
+import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gwt.user.client.ui.Button;
 
@@ -32,7 +33,7 @@ class CherryPickAction {
     new CherryPickDialog(b, new Project.NameKey(project)) {
       {
         sendButton.setText(Util.C.buttonCherryPickChangeSend());
-        if (info.status().isClosed()) {
+        if (info.status() == Change.Status.MERGED) {
           message.setText(Util.M.cherryPickedChangeDefaultMessage(
               commitMessage.trim(),
               revision));