diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-05-26 17:13:57 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2015-05-27 09:55:05 +0000 |
| commit | 4aa51166946637eff89192a9146d5d335b8018e7 (patch) | |
| tree | 88204512885e55c48e6c9fe2619854798e94d36f /src/plugins/git | |
| parent | 0b44b6e709aa9ef8a62af67907bde2105487e028 (diff) | |
| download | qt-creator-4aa51166946637eff89192a9146d5d335b8018e7.tar.gz | |
Git: Re-disable timeout for interactive rebase
Broken by be3e0438c630cccea5a6a8ad2118884b0a595979.
Change-Id: I2d22a47b764940e9c36847f2c6ea6c8e29cb29de
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index a7e10d4174..0c9cda9c1f 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -2930,10 +2930,11 @@ VcsCommand *GitClient::vcsExecAbortable(const QString &workingDirectory, QTC_ASSERT(!arguments.isEmpty(), return 0); QString abortCommand = arguments.at(0); - // Git might request an editor, so this must be done asynchronously - VcsCommand *command = vcsExec(workingDirectory, arguments, 0, true, 0, workingDirectory); - // ... and without timeout - command->setDefaultTimeoutS(0); + // Git might request an editor, so this must be done asynchronously and without timeout + VcsCommand *command = createCommand(workingDirectory, 0, VcsWindowOutputBind); + command->setCookie(workingDirectory); + command->addJob(vcsBinary(), arguments, 0); + command->execute(); ConflictHandler::attachToCommand(command, abortCommand); return command; |