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

Git: Initialize ConflictHandler before executing command

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

Change-Id: I27e82fd2a979a043932b4a838f3736cbe0f60107
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-06-10 18:05:00 +03:00
committed by Orgad Shaneh
parent e97a565605
commit 5cb29aec0b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2353,9 +2353,9 @@ void GitClient::continuePreviousGitCommand(const QString &workingDirectory,
settings()->stringValue(GitSettings::binaryPathKey), settings()->stringValue(GitSettings::binaryPathKey),
arguments); arguments);
VcsBase::Command *command = createCommand(workingDirectory, 0, true); VcsBase::Command *command = createCommand(workingDirectory, 0, true);
new ConflictHandler(command, workingDirectory, gitCommand);
command->addJob(arguments, -1); command->addJob(arguments, -1);
command->execute(); command->execute();
new ConflictHandler(command, workingDirectory, gitCommand);
} else { } else {
GitPlugin::instance()->startCommit(); GitPlugin::instance()->startCommit();
} }
@@ -3033,10 +3033,10 @@ void GitClient::interactiveRebase(const QString &workingDirectory, const QString
if (fixup) if (fixup)
m_disableEditor = true; m_disableEditor = true;
VcsBase::Command *command = createCommand(workingDirectory, 0, true); VcsBase::Command *command = createCommand(workingDirectory, 0, true);
new ConflictHandler(command, workingDirectory, QLatin1String("rebase"));
command->addJob(arguments, -1); command->addJob(arguments, -1);
command->execute(); command->execute();
command->setCookie(workingDirectory); command->setCookie(workingDirectory);
new ConflictHandler(command, workingDirectory, QLatin1String("rebase"));
if (fixup) if (fixup)
m_disableEditor = false; m_disableEditor = false;
} }