feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Fix stash pop on end of a continuous command

Browse Source 
Broken in 92392454b7

Change-Id: I4e3d3b1c2fbec66c5471baedf1996529b852b868
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-06-04 23:33:32 +03:00
committed by Orgad Shaneh
parent 8140a87f9a
commit 2ee83d4c9e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gitclient.cpp
View File

@@ -651,7 +651,7 @@ public:
GitClient *client = GitPlugin::instance()->gitClient(); 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);
if (client->checkCommandInProgress(m_workingDirectory) != GitClient::NoCommand) if (client->checkCommandInProgress(m_workingDirectory) == GitClient::NoCommand)
client->endStashScope(m_workingDirectory); client->endStashScope(m_workingDirectory);
} else { } else {
client->handleMergeConflicts(m_workingDirectory, m_commit, m_command); client->handleMergeConflicts(m_workingDirectory, m_commit, m_command);