From dd3f5f03064a497d7b4f6fcaabcfd24376eb802c Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Fri, 22 Mar 2019 22:52:48 +0300 Subject: [PATCH] [git] check changes to one of the parents instead of merged changes Parameter withFullMergeDiff controls whether changes to parents are collected or not. --- plugins/git4idea/tests/git4idea/history/GitLogUtilTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/git4idea/tests/git4idea/history/GitLogUtilTest.kt b/plugins/git4idea/tests/git4idea/history/GitLogUtilTest.kt index 73072c854dc9..67cbc1425cc7 100644 --- a/plugins/git4idea/tests/git4idea/history/GitLogUtilTest.kt +++ b/plugins/git4idea/tests/git4idea/history/GitLogUtilTest.kt @@ -86,6 +86,6 @@ class GitLogUtilTest : GitSingleRepoTest() { val lastCommit = ContainerUtil.getFirstItem(details) assertNotNull(lastCommit) - assertTrue(lastCommit!!.changes.isEmpty()) + assertTrue(lastCommit!!.getChanges(0).isEmpty()) } } \ No newline at end of file