Commit 2ee83d4c authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

Git: Fix stash pop on end of a continuous command

Broken in 92392454



Change-Id: I4e3d3b1c2fbec66c5471baedf1996529b852b868
Reviewed-by: default avatarPetar Perisin <petar.perisin@gmail.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 8140a87f
......@@ -651,7 +651,7 @@ public:
GitClient *client = GitPlugin::instance()->gitClient();
if (m_commit.isEmpty()) {
GitPlugin::instance()->gitVersionControl()->emitRepositoryChanged(m_workingDirectory);
if (client->checkCommandInProgress(m_workingDirectory) != GitClient::NoCommand)
if (client->checkCommandInProgress(m_workingDirectory) == GitClient::NoCommand)
client->endStashScope(m_workingDirectory);
} else {
client->handleMergeConflicts(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