From f1f4efb944dddcb61fa719de7c133c49ee8a69ad Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Fri, 5 Dec 2014 16:06:39 +0300
Subject: [PATCH] [git] Use more specific method for branch names in pull
 dialog

---
 plugins/git4idea/src/git4idea/merge/GitPullDialog.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/merge/GitPullDialog.java b/plugins/git4idea/src/git4idea/merge/GitPullDialog.java
index faf9398ba966..be1ebac877ab 100644
--- a/plugins/git4idea/src/git4idea/merge/GitPullDialog.java
+++ b/plugins/git4idea/src/git4idea/merge/GitPullDialog.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
-import git4idea.GitBranch;
 import git4idea.GitRemoteBranch;
 import git4idea.GitUtil;
 import git4idea.commands.GitCommand;
@@ -175,7 +174,7 @@ public class GitPullDialog extends DialogWrapper {
     myBranchChooser.setElements(ContainerUtil.mapNotNull(remoteBranches, new Function<GitRemoteBranch, String>() {
       @Override
       public String fun(GitRemoteBranch branch) {
-        return branch.getRemote().getName().equals(selectedRemote) ? branch.getName() : null;
+        return branch.getRemote().getName().equals(selectedRemote) ? branch.getNameForLocalOperations() : null;
       }
     }), false);
     if (currentRemoteBranch != null && currentRemoteBranch.getRemote().getName().equals(selectedRemote)) {