From f757db63d5c601cc8fc8ae05400ee2a1783324cd Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Fri, 11 Mar 2016 16:42:42 +0300
Subject: [PATCH] git: IDEA-152430 Removing remote branch should offer to
 delete tracking branch

This used to work, but was broken a while ago, during some
refactoring related to using of GitRemoteBranch objects.
---
 .../src/git4idea/ui/branch/GitMultiRootBranchConfig.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java b/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java
index 360cf56fe505..ab899d770bc2 100644
--- a/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java
+++ b/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java
@@ -94,7 +94,7 @@ public class GitMultiRootBranchConfig extends DvcsMultiRootBranchConfig<GitRepos
   public static Collection<String> getTrackingBranches(@NotNull GitRepository repository, @NotNull String remoteBranch) {
     Collection<String> trackingBranches = new ArrayList<String>(1);
     for (GitBranchTrackInfo trackInfo : repository.getBranchTrackInfos()) {
-      if (remoteBranch.equals(trackInfo.getRemote().getName() + "/" + trackInfo.getRemoteBranch())) {
+      if (remoteBranch.equals(trackInfo.getRemoteBranch().getNameForLocalOperations())) {
         trackingBranches.add(trackInfo.getLocalBranch().getName());
       }
     }