aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/gitclient.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <[email protected]>2009-04-09 10:05:53 +0200
committerFriedemann Kleint <[email protected]>2009-04-09 10:05:53 +0200
commit3a5b6825a7d5090eebcaa345ebbc718a4580e0cd (patch)
treee81d812f5ae16de8094cc7fd5e388e029e150666 /src/plugins/git/gitclient.cpp
parent3d55c45e2cdf0866ce8657409c880ec37e72e418 (diff)
Report termination of git pull/push (which was missing feedback).
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
-rw-r--r--src/plugins/git/gitclient.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index d563b95d8fe..2b93589317c 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -503,11 +503,13 @@ GitCommand *GitClient::createCommand(const QString &workingDirectory,
void GitClient::executeGit(const QString &workingDirectory,
const QStringList &arguments,
VCSBase::VCSBaseEditor* editor,
- bool outputToWindow)
+ bool outputToWindow,
+ GitCommand::TerminationReportMode tm)
{
m_plugin->outputWindow()->append(formatCommand(QLatin1String(Constants::GIT_BINARY), arguments));
GitCommand *command = createCommand(workingDirectory, editor, outputToWindow);
command->addJob(arguments, m_settings.timeout);
+ command->setTerminationReportMode(tm);
command->execute();
}
@@ -926,12 +928,12 @@ void GitClient::revert(const QStringList &files)
void GitClient::pull(const QString &workingDirectory)
{
- executeGit(workingDirectory, QStringList(QLatin1String("pull")), 0, true);
+ executeGit(workingDirectory, QStringList(QLatin1String("pull")), 0, true, GitCommand::ReportStderr);
}
void GitClient::push(const QString &workingDirectory)
{
- executeGit(workingDirectory, QStringList(QLatin1String("push")), 0, true);
+ executeGit(workingDirectory, QStringList(QLatin1String("push")), 0, true, GitCommand::ReportStderr);
}
QString GitClient::msgNoChangedFiles()