From ece065b21d6e7299fe8ddfd36d1b2a49b5d37861 Mon Sep 17 00:00:00 2001
From: "Nikolay.Rykunov" <Nikolay.Rykunov@jetbrains.com>
Date: Wed, 10 Apr 2019 19:27:12 +0300
Subject: [PATCH] Add hashes filtering by the roots

There may be commits from different repositories but these commits can contain the same file. And git log will throw a bad object error
---
 .../changeReminder/repository/FilesHistoryProvider.kt          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/changeReminder/src/com/jetbrains/changeReminder/repository/FilesHistoryProvider.kt b/plugins/changeReminder/src/com/jetbrains/changeReminder/repository/FilesHistoryProvider.kt
index 9f9862e553ff..4882f28bacbc 100644
--- a/plugins/changeReminder/src/com/jetbrains/changeReminder/repository/FilesHistoryProvider.kt
+++ b/plugins/changeReminder/src/com/jetbrains/changeReminder/repository/FilesHistoryProvider.kt
@@ -20,7 +20,8 @@ internal class FilesHistoryProvider(private val project: Project, private val ro
   private fun getCommitsData(commits: Collection<Int>): Map<Int, Commit> {
     val hashes = mutableMapOf<String, Int>()
     for (commit in commits) {
-      val hash = dataGetter.logStorage.getCommitId(commit)?.hash?.asString() ?: continue
+      val commitId = dataGetter.logStorage.getCommitId(commit) ?: continue
+      val hash = commitId.takeIf { commitId.root == root }?.hash?.asString() ?: continue
       hashes[hash] = commit
     }