diff --git a/plugins/git4idea/src/git4idea/actions/GitMergeAction.java b/plugins/git4idea/src/git4idea/actions/GitMergeAction.java index 7dec40c64a60..0bb0ea73dd0b 100644 --- a/plugins/git4idea/src/git4idea/actions/GitMergeAction.java +++ b/plugins/git4idea/src/git4idea/actions/GitMergeAction.java @@ -15,6 +15,7 @@ import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import git4idea.GitRevisionNumber; import git4idea.GitUtil; +import git4idea.GitVcs; import git4idea.commands.*; import git4idea.merge.GitMergeUtil; import git4idea.repo.GitRepository; @@ -103,7 +104,7 @@ abstract class GitMergeAction extends GitRepositoryAction { List exceptions = new ArrayList<>(); GitMergeUtil.showUpdates(project, exceptions, root, currentRev, beforeLabel, getActionName(), ActionInfo.UPDATE); repository.update(); - showErrors(project, getActionName(), exceptions); + GitVcs.getInstance(project).showErrors(exceptions, getActionName()); } else if (localChangesDetector.wasMessageDetected()) { LocalChangesWouldBeOverwrittenHelper.showErrorNotification(project, repository.getRoot(), getActionName(), diff --git a/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java b/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java index 93cf78e8d788..7b97dc21394c 100644 --- a/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java +++ b/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java @@ -60,10 +60,6 @@ public abstract class GitRepositoryAction extends DumbAwareAction { return currentRepository != null ? currentRepository.getRoot() : roots.get(0); } - protected static void showErrors(@NotNull Project project, @NotNull String actionName, @NotNull List exceptions) { - GitVcs.getInstance(project).showErrors(exceptions, actionName); - } - /** * @deprecated "final tasks" are not called for all actions anymore. * They should be called by certain actions manually if and when needed.