diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java index 5c1ad585cb5a..f1317fa06d20 100644 --- a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java +++ b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java @@ -835,7 +835,15 @@ public class GitHistoryUtils { List commits = ContainerUtil.newArrayList(); - loadDetails(project, root, withRefs, withChanges, record -> commits.add(converter.fun(record)), parameters); + try { + loadDetails(project, root, withRefs, withChanges, record -> commits.add(converter.fun(record)), parameters); + } + catch (VcsException e) { + if (commits.isEmpty()) { + throw e; + } + LOG.warn("Error during loading details, returning partially loaded commits\n", e); + } return commits; }