From 61efd84a6bbc1494d530ed1590c5efb306458fb1 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Mon, 8 Oct 2012 14:58:08 +0400 Subject: [PATCH] remove unused code --- .../src/git4idea/stash/GitStashUtils.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/plugins/git4idea/src/git4idea/stash/GitStashUtils.java b/plugins/git4idea/src/git4idea/stash/GitStashUtils.java index a36a87ec0576..685164150f63 100644 --- a/plugins/git4idea/src/git4idea/stash/GitStashUtils.java +++ b/plugins/git4idea/src/git4idea/stash/GitStashUtils.java @@ -81,21 +81,4 @@ public class GitStashUtils { consumer.consume(new StashInfo(s.boundedToken(':'), s.boundedToken(':'), s.line().trim())); } } - - // drops stash (after completing conflicting merge during unstashing), shows a warning in case of error - public static void dropStash(Project project, VirtualFile root) { - final GitSimpleHandler handler = new GitSimpleHandler(project, root, GitCommand.STASH); - handler.setNoSSH(true); - handler.addParameters("drop"); - String output = null; - try { - output = handler.run(); - } catch (VcsException e) { - LOG.info("dropStash " + output, e); - GitUIUtil.notifyMessage(project, "Couldn't drop stash", - "Couldn't drop stash after resolving conflicts.
Please drop stash manually.", - WARNING, false, handler.errors()); - } - } - }