From 2a52c5d620bdf6603d5ea7ad698640d8a9f30b7c Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Thu, 8 Dec 2016 19:27:21 +0300 Subject: [PATCH] [git] tracked branch appears twice in branch filter: under tracked group and under corresponding remote group IDEA-129339 --- plugins/git4idea/src/git4idea/log/GitRefManager.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/git4idea/src/git4idea/log/GitRefManager.java b/plugins/git4idea/src/git4idea/log/GitRefManager.java index 7b11ad09138d..53b130d9551e 100644 --- a/plugins/git4idea/src/git4idea/log/GitRefManager.java +++ b/plugins/git4idea/src/git4idea/log/GitRefManager.java @@ -115,12 +115,10 @@ public class GitRefManager implements VcsLogRefManager { localBranches.add(ref); } else if (allRemote.containsKey(refName)) { + remoteRefGroups.putValue(allRemote.get(refName), ref); if (tracked.contains(refName)) { trackedBranches.add(ref); } - else { - remoteRefGroups.putValue(allRemote.get(refName), ref); - } } else { LOG.debug("Didn't find ref neither in local nor in remote branches: " + ref);