diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-08-25 09:57:58 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-08-25 10:09:53 +0200 |
| commit | 014bcf908119ab34e896f422b1cdab1398e3394e (patch) | |
| tree | f276bb4f4702715ec75a24c4b95fe03e0b91e0bb | |
| parent | 3dd39c1da4d6f610004d73c1a04f7cb041b82a0c (diff) | |
Git: Make commit work on Windows
(cherry picked from commit 40f6f72a5d4403b0f39d64ed0e622f348572a1b3)
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 1d2b316117..1756a49902 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -527,16 +527,16 @@ QStringList GitClient::processEnvironment() const } bool GitClient::synchronousGit(const QString &workingDirectory, - const QStringList &arguments, + const QStringList &gitArguments, QByteArray* outputText, QByteArray* errorText, bool logCommandToWindow) { if (Git::Constants::debug) - qDebug() << "synchronousGit" << workingDirectory << arguments; + qDebug() << "synchronousGit" << workingDirectory << gitArguments; if (logCommandToWindow) - VCSBase::VCSBaseOutputWindow::instance()->appendCommand(formatCommand(m_binaryPath, arguments)); + VCSBase::VCSBaseOutputWindow::instance()->appendCommand(formatCommand(m_binaryPath, gitArguments)); QProcess process; process.setWorkingDirectory(workingDirectory); @@ -545,8 +545,8 @@ bool GitClient::synchronousGit(const QString &workingDirectory, QStringList args = binary(); const QString executable = args.front(); args.pop_front(); - args.append(arguments); - process.start(executable, arguments); + args.append(gitArguments); + process.start(executable, args); process.closeWriteChannel(); if (!process.waitForFinished()) { |