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

Git: Do not pop stash if a command is in progress

Browse Source 
Running interactive rebase and choosing edit for a commit causes
stash pop when the commit is expected to be edited

Change-Id: I37249e8486b609dedba143bd130059444f882303
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-03 14:44:36 +03:00
committed by Orgad Shaneh
parent d96535bd23
commit 92392454b7
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -648,12 +648,13 @@ public:
~ConflictHandler()
{
GitClient *client = GitPlugin::instance()->gitClient();
if (m_commit.isEmpty()) {
GitPlugin::instance()->gitVersionControl()->emitRepositoryChanged(m_workingDirectory);
GitPlugin::instance()->gitClient()->endStashScope(m_workingDirectory);
if (client->checkCommandInProgress(m_workingDirectory) != GitClient::NoCommand)
client->endStashScope(m_workingDirectory);
} else {
GitPlugin::instance()->gitClient()->handleMergeConflicts(
m_workingDirectory, m_commit, m_command);
client->handleMergeConflicts(m_workingDirectory, m_commit, m_command);
}
}