Commit 92392454 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

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



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: default avatarPetar Perisin <petar.perisin@gmail.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent d96535bd
...@@ -648,12 +648,13 @@ public: ...@@ -648,12 +648,13 @@ public:
~ConflictHandler() ~ConflictHandler()
{ {
GitClient *client = GitPlugin::instance()->gitClient();
if (m_commit.isEmpty()) { if (m_commit.isEmpty()) {
GitPlugin::instance()->gitVersionControl()->emitRepositoryChanged(m_workingDirectory); GitPlugin::instance()->gitVersionControl()->emitRepositoryChanged(m_workingDirectory);
GitPlugin::instance()->gitClient()->endStashScope(m_workingDirectory); if (client->checkCommandInProgress(m_workingDirectory) != GitClient::NoCommand)
client->endStashScope(m_workingDirectory);
} else { } else {
GitPlugin::instance()->gitClient()->handleMergeConflicts( client->handleMergeConflicts(m_workingDirectory, m_commit, m_command);
m_workingDirectory, m_commit, m_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