From 5cb29aec0b104179919d14573c7af88610c39e87 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 10 Jun 2013 18:05:00 +0300 Subject: [PATCH] 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: Petar Perisin Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index dabe5716883..4b432d8b457 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -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; }