MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[git] Rebase: Refresh the VFS & CLM before Rebase to avoid attempts to shelve changes which don't actually exist

Browse Source 
GitOrigin-RevId: 79632a9f9143dea250842b66c7dffd6452e152e7
This commit is contained in:
Nikolay Rykunov
2019-12-27 14:31:09 +00:00
committed by intellij-monorepo-bot
parent 6fc819bd38
commit 4be0f44eda
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/tests/git4idea/rebase/interactive/GitInteractiveRebaseUsingLogTest.kt
+4
View File
@@ -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