From 46ee6dee35e380febb835c44a50af83c7c4f009c Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Wed, 3 Aug 2016 15:35:30 +0300 Subject: [PATCH] [vcs-log] deal with theoretical possibility of having no visible branches or head tags for a root EA-86545 --- .../com/intellij/vcs/log/data/FakeVisiblePackBuilder.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/FakeVisiblePackBuilder.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/FakeVisiblePackBuilder.java index 30fc8ccd162b..69f1de7fb050 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/FakeVisiblePackBuilder.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/FakeVisiblePackBuilder.java @@ -91,8 +91,9 @@ public class FakeVisiblePackBuilder { Map> map = VcsLogUtil.groupRefsByRoot(branchesAndHeads); Map refs = ContainerUtil.newHashMap(); - for (VirtualFile root : map.keySet()) { - refs.put(root, new CompressedRefs(map.get(root), myHashMap)); + for (VirtualFile root : providers.keySet()) { + Set refsForRoot = map.get(root); + refs.put(root, new CompressedRefs(refsForRoot == null ? ContainerUtil.newHashSet() : refsForRoot, myHashMap)); } return new RefsModel(refs, heads, myHashMap, providers); }