aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/vcsbase
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2015-04-14 22:26:38 +0300
committerOrgad Shaneh <orgads@gmail.com>2015-04-15 12:48:54 +0000
commitec2d13641bd890e72fc47a4617da47cb3ab223f7 (patch)
tree03d636993eac1b165364a03b6ba7b86a9697cffa /src/plugins/vcsbase
parenta79df8e1e78384745e68d365b23cc77656c060aa (diff)
Git: Suppress stderr output for fully synchronous executions
Broken by dcdcf540487448d0f4f0b3cb2ccdd1a305210737. Change-Id: I32f56bb432dfd3ce26397fd41908c6823cd4d7f1 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/vcsbase')
-rw-r--r--src/plugins/vcsbase/vcsbaseclient.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index cef245d051..5b262ee4c7 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -211,7 +211,7 @@ bool VcsBaseClientImpl::vcsFullySynchronousExec(const QString &workingDir, const
command->addFlags(flags);
bool result = command->runFullySynchronous(args, vcsTimeoutS(), outputData,
errorData ? errorData : &internalErrorData);
- if (!internalErrorData.isEmpty())
+ if (!internalErrorData.isEmpty() && !(flags & VcsBasePlugin::SuppressStdErrInLogWindow))
VcsOutputWindow::appendError(commandOutputFromLocal8Bit(internalErrorData));
return result;
}