MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

git: IDEA-152430 Removing remote branch should offer to delete tracking branch

Browse Source 
This used to work, but was broken a while ago, during some
refactoring related to using of GitRemoteBranch objects.
This commit is contained in:
Kirill Likhodedov
2016-03-11 16:43:50 +03:00
parent 64d5273086
commit f757db63d5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java
+1 -1
View File
@@ -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());
}
}