Commit 5cb29aec authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Git: Initialize ConflictHandler before executing command

expectDirectoryChange is called by ConflictHandler. After the command
is executed it is too late

Change-Id: I27e82fd2a979a043932b4a838f3736cbe0f60107
Reviewed-by: default avatarPetar Perisin <petar.perisin@gmail.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent e97a5656
......@@ -2353,9 +2353,9 @@ void GitClient::continuePreviousGitCommand(const QString &workingDirectory,
settings()->stringValue(GitSettings::binaryPathKey),
arguments);
VcsBase::Command *command = createCommand(workingDirectory, 0, true);
new ConflictHandler(command, workingDirectory, gitCommand);
command->addJob(arguments, -1);
command->execute();
new ConflictHandler(command, workingDirectory, gitCommand);
} else {
GitPlugin::instance()->startCommit();
}
......@@ -3033,10 +3033,10 @@ void GitClient::interactiveRebase(const QString &workingDirectory, const QString
if (fixup)
m_disableEditor = true;
VcsBase::Command *command = createCommand(workingDirectory, 0, true);
new ConflictHandler(command, workingDirectory, QLatin1String("rebase"));
command->addJob(arguments, -1);
command->execute();
command->setCookie(workingDirectory);
new ConflictHandler(command, workingDirectory, QLatin1String("rebase"));
if (fixup)
m_disableEditor = false;
}
......
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