From 2ee83d4c9e1166a81d1d7025674f9e201e3c8460 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 4 Jun 2013 23:33:32 +0300
Subject: [PATCH] Git: Fix stash pop on end of a continuous command
Broken in 92392454b74b5f79af5095e4f5725f0d4f57e6f1
Change-Id: I4e3d3b1c2fbec66c5471baedf1996529b852b868
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/git/gitclient.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 45bcf40495e..3201097c6b2 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -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);
--
GitLab