Commit 4aa51166 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

Git: Re-disable timeout for interactive rebase

Broken by be3e0438

.

Change-Id: I2d22a47b764940e9c36847f2c6ea6c8e29cb29de
Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
parent 0b44b6e7
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment