opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.8'

Browse Source 
* stable-2.8:
  Only add "cherry picked from" when cherry picking a merged change

Change-Id: Ia07a4dc78e96eeb2b439329c92c73be8f73c2e98
This commit is contained in:
David Pursehouse 2014-01-28 17:11:50 +09:00
commit e994c16df9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CherryPickAction.java
View File

@ -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));