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

Git: Re-disable timeout for interactive rebase

Browse Source 
Broken by be3e0438c6.

Change-Id: I2d22a47b764940e9c36847f2c6ea6c8e29cb29de
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-05-26 17:13:57 +03:00
committed by Orgad Shaneh
parent 0b44b6e709
commit 4aa5116694
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2930,10 +2930,11 @@ VcsCommand *GitClient::vcsExecAbortable(const QString &workingDirectory,
QTC_ASSERT(!arguments.isEmpty(), return 0); QTC_ASSERT(!arguments.isEmpty(), return 0);
QString abortCommand = arguments.at(0); QString abortCommand = arguments.at(0);
// 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
VcsCommand *command = vcsExec(workingDirectory, arguments, 0, true, 0, workingDirectory); VcsCommand *command = createCommand(workingDirectory, 0, VcsWindowOutputBind);
// ... and without timeout command->setCookie(workingDirectory);
command->setDefaultTimeoutS(0); command->addJob(vcsBinary(), arguments, 0);
command->execute();
ConflictHandler::attachToCommand(command, abortCommand); ConflictHandler::attachToCommand(command, abortCommand);
return command; return command;