From 2a8350eca840232acd8e6f100b37876b0b2cabd1 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 23 Apr 2014 08:59:43 +0300 Subject: Git: Suppress command logging for internal git-remote calls Change-Id: I8cd93d0f5fdcc685af1cf1526eecf97d3b19eeff Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 8 ++++---- src/plugins/git/gitclient.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 51b03ec78b..402b132b09 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -2331,13 +2331,13 @@ bool GitClient::synchronousForEachRefCmd(const QString &workingDirectory, QStrin } bool GitClient::synchronousRemoteCmd(const QString &workingDirectory, QStringList remoteArgs, - QString *output, QString *errorMessage) + QString *output, QString *errorMessage, bool silent) { remoteArgs.push_front(QLatin1String("remote")); QByteArray outputText; QByteArray errorText; - const bool rc = fullySynchronousGit(workingDirectory, remoteArgs, &outputText, &errorText); - if (!rc) { + if (!fullySynchronousGit(workingDirectory, remoteArgs, &outputText, &errorText, + silent ? VcsBasePlugin::SuppressCommandLogging : 0)) { msgCannotRun(remoteArgs, workingDirectory, errorText, errorMessage); return false; } @@ -2352,7 +2352,7 @@ QMap GitClient::synchronousRemotesList(const QString &workingDi QString output; QString error; QStringList args(QLatin1String("-v")); - if (!synchronousRemoteCmd(workingDirectory, args, &output, &error)) { + if (!synchronousRemoteCmd(workingDirectory, args, &output, &error, true)) { msgCannotRun(error, errorMessage); return result; } diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index c7d5c0c2f4..ac964380f0 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -206,7 +206,7 @@ public: bool synchronousForEachRefCmd(const QString &workingDirectory, QStringList args, QString *output, QString *errorMessage = 0); bool synchronousRemoteCmd(const QString &workingDirectory, QStringList remoteArgs, - QString *output, QString *errorMessage); + QString *output, QString *errorMessage, bool silent = false); QMap synchronousRemotesList(const QString &workingDirectory, QString *errorMessage = 0); -- cgit v1.2.1