From d5f97e930dc74d112bc4dc4239fad9571d0ccbe5 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Tue, 1 Sep 2015 12:15:02 +0300 Subject: [PATCH] [git] IDEA-142908 Cherry-pick always does a thing, even when the commit dialog is shown afterwards => no ... is needed in the name --- plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java b/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java index 4851697406ce..1ff61cbf224d 100644 --- a/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java +++ b/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java @@ -78,7 +78,6 @@ public class GitCherryPicker extends VcsCherryPicker { private static final String CHERRY_PICK_HEAD_FILE = "CHERRY_PICK_HEAD"; private static final Logger LOG = Logger.getInstance(GitCherryPicker.class); - private static final String NAME = "Cherry-Pick"; @NotNull private final Project myProject; @NotNull private final Git myGit; @@ -521,7 +520,7 @@ public class GitCherryPicker extends VcsCherryPicker { @NotNull @Override public String getActionTitle() { - return isAutoCommit() ? NAME : NAME + "..."; + return "Cherry-Pick"; } private boolean isAutoCommit() {