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

remove unused code

Browse Source
This commit is contained in:
Kirill Likhodedov
2012-10-10 16:22:26 +04:00
parent 66278b154c
commit 61efd84a6b
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/stash/GitStashUtils.java
-17
View File
@@ -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.<br/>Please drop stash manually.",
WARNING, false, handler.errors());
}
}
}