feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Suppress double logging of commands

Browse Source 
appendCommand() is already called by runVcs.

Change-Id: I215ac00d0efc36e5f62865d7d2cf9941533a160d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-04-14 23:44:21 +03:00
committed by Tobias Hunger
parent 1da6b16a55
commit 5bf6cfb381
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/git/gitclient.cpp
View File

@@ -2014,9 +2014,6 @@ VcsCommand *GitClient::executeGit(const QString &workingDirectory,
unsigned additionalFlags, unsigned additionalFlags,
int editorLineNumber) int editorLineNumber)
{ {
VcsOutputWindow::appendCommand(workingDirectory,
FileName::fromUserInput(settings()->stringValue(GitSettings::binaryPathKey)),
arguments);
VcsCommand *command = createCommand(workingDirectory, editor, useOutputToWindow, editorLineNumber); VcsCommand *command = createCommand(workingDirectory, editor, useOutputToWindow, editorLineNumber);
command->addJob(arguments, settings()->intValue(GitSettings::timeoutKey)); command->addJob(arguments, settings()->intValue(GitSettings::timeoutKey));
command->addFlags(additionalFlags); command->addFlags(additionalFlags);
@@ -3128,7 +3125,6 @@ void GitClient::asyncCommand(const QString &workingDirectory, const QStringList
// Git might request an editor, so this must be done asynchronously // Git might request an editor, so this must be done asynchronously
// and without timeout // and without timeout
QString gitCommand = arguments.first(); QString gitCommand = arguments.first();
VcsOutputWindow::appendCommand(workingDirectory, settings()->binaryPath(), arguments);
VcsCommand *command = createCommand(workingDirectory, 0, true); VcsCommand *command = createCommand(workingDirectory, 0, true);
new ConflictHandler(command, workingDirectory, gitCommand); new ConflictHandler(command, workingDirectory, gitCommand);
if (hasProgress) if (hasProgress)
@@ -3174,7 +3170,6 @@ void GitClient::interactiveRebase(const QString &workingDirectory, const QString
if (fixup) if (fixup)
arguments << QLatin1String("--autosquash"); arguments << QLatin1String("--autosquash");
arguments << commit + QLatin1Char('^'); arguments << commit + QLatin1Char('^');
VcsOutputWindow::appendCommand(workingDirectory, settings()->binaryPath(), arguments);
if (fixup) if (fixup)
m_disableEditor = true; m_disableEditor = true;
asyncCommand(workingDirectory, arguments, true); asyncCommand(workingDirectory, arguments, true);