From 6a845f3593881083970f7fd7956146fbb59db738 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Mon, 26 Jun 2017 19:37:29 +0300 Subject: [PATCH] Fix reword error handling: comparing with incorrect class Follow-up to fe62334 --- plugins/git4idea/src/git4idea/rebase/GitRewordOperation.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/rebase/GitRewordOperation.kt b/plugins/git4idea/src/git4idea/rebase/GitRewordOperation.kt index 2e7a5a87aafd..4a58b21adb6c 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRewordOperation.kt +++ b/plugins/git4idea/src/git4idea/rebase/GitRewordOperation.kt @@ -78,7 +78,7 @@ class GitRewordOperation(private val repository: GitRepository, is UndoPossibility.HeadMoved -> notifier.notifyError(errorTitle, "Repository has already been changed") is UndoPossibility.PushedToProtectedBranch -> notifier.notifyError(errorTitle, "Commit has already been pushed to ${possibility.branch}") - is Error -> notifier.notifyError(errorTitle, "") + is UndoPossibility.Error -> notifier.notifyError(errorTitle, "") else -> doUndo() } }