From 4be0f44eda06cd0c3a3205df909e89911a96f3e1 Mon Sep 17 00:00:00 2001
From: Nikolay Rykunov <Nikolay.Rykunov@jetbrains.com>
Date: Fri, 27 Dec 2019 17:15:53 +0300
Subject: [PATCH] [git] Rebase: Refresh the VFS & CLM before Rebase to avoid
 attempts to shelve changes which don't actually exist

GitOrigin-RevId: 79632a9f9143dea250842b66c7dffd6452e152e7
---
 .../rebase/interactive/GitInteractiveRebaseUsingLogTest.kt    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/git4idea/tests/git4idea/rebase/interactive/GitInteractiveRebaseUsingLogTest.kt b/plugins/git4idea/tests/git4idea/rebase/interactive/GitInteractiveRebaseUsingLogTest.kt
index cac4c3f446d6..7c2a345f05d6 100644
--- a/plugins/git4idea/tests/git4idea/rebase/interactive/GitInteractiveRebaseUsingLogTest.kt
+++ b/plugins/git4idea/tests/git4idea/rebase/interactive/GitInteractiveRebaseUsingLogTest.kt
@@ -142,6 +142,10 @@ class GitInteractiveRebaseUsingLogTest : GitSingleRepoTest() {
         return entries
       }
     }
+
+    refresh()
+    updateChangeListManager()
+
     val params = GitRebaseParams.editCommits(repo.vcs.version, commit.parents.first().asString(), editorHandler, false)
     GitRebaseUtils.rebase(repo.project, listOf(repo), params, EmptyProgressIndicator())
     return entriesGeneratedUsingGit