From 92392454b74b5f79af5095e4f5725f0d4f57e6f1 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 3 Jun 2013 14:44:36 +0300 Subject: [PATCH] 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: Petar Perisin Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index d460e70e297..aebcb0ebe55 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -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); } }