From e1d05354f4a581914bdc6bfc5e2bf92d4520250d Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Fri, 14 Dec 2012 17:13:13 +0400 Subject: [PATCH] [git] Make some commands silent. --- plugins/git4idea/src/git4idea/branch/GitBranchUtil.java | 1 + plugins/git4idea/src/git4idea/history/GitHistoryUtils.java | 2 +- .../src/git4idea/update/GitUpdateLocallyModifiedDialog.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchUtil.java b/plugins/git4idea/src/git4idea/branch/GitBranchUtil.java index 560dbb44cc51..88c5d20c8869 100644 --- a/plugins/git4idea/src/git4idea/branch/GitBranchUtil.java +++ b/plugins/git4idea/src/git4idea/branch/GitBranchUtil.java @@ -112,6 +112,7 @@ public class GitBranchUtil { GitSimpleHandler handler = new GitSimpleHandler(project, root, GitCommand.REV_PARSE); handler.addParameters("--abbrev-ref", "HEAD"); handler.setNoSSH(true); + handler.setSilent(true); try { String name = handler.run(); if (!name.equals("HEAD")) { diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java index 37fd78431b35..19f49e3048f1 100644 --- a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java +++ b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java @@ -836,7 +836,7 @@ public class GitHistoryUtils { GitSimpleHandler h = new GitSimpleHandler(project, root, GitCommand.SHOW); GitLogParser parser = new GitLogParser(project, GitLogParser.NameStatus.STATUS, AUTHOR_TIME); h.setNoSSH(true); - h.setStdoutSuppressed(true); + h.setSilent(true); h.addParameters("--name-status", parser.getPretty(), "--encoding=UTF-8"); h.addParameters(commitsId); diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java b/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java index e597477eeb21..c295a54cda50 100644 --- a/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java +++ b/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java @@ -136,6 +136,7 @@ public class GitUpdateLocallyModifiedDialog extends DialogWrapper { GitSimpleHandler h = new GitSimpleHandler(project, root, GitCommand.DIFF); h.addParameters("--name-status"); h.setNoSSH(true); + h.setSilent(true); h.setStdoutSuppressed(true); StringScanner s = new StringScanner(h.run()); while (s.hasMoreData()) {