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 <>
Reviewed-by: default avatarTobias Hunger <>
parent d96535bd
......@@ -648,12 +648,13 @@ public:
GitClient *client = GitPlugin::instance()->gitClient();
if (m_commit.isEmpty()) {
if (client->checkCommandInProgress(m_workingDirectory) != GitClient::NoCommand)
} else {
m_workingDirectory, m_commit, m_command);
client->handleMergeConflicts(m_workingDirectory, m_commit, m_command);
Supports Markdown
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