Commit 60129c40 authored by Orgad Shaneh's avatar Orgad Shaneh
Browse files

Git: Only stash pop if pull succeeds



Change-Id: I7861d862fdd3d24201e39bb4c7a9cb91643acc35
Reviewed-by: default avatarPetar Perisin <petar.perisin@gmail.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent aed53a70
......@@ -888,8 +888,7 @@ void GitPlugin::pull()
switch (stashResult) {
case GitClient::StashUnchanged:
case GitClient::Stashed:
m_gitClient->synchronousPull(state.topLevel(), rebase);
if (stashResult == GitClient::Stashed)
if (m_gitClient->synchronousPull(state.topLevel(), rebase) && (stashResult == GitClient::Stashed))
m_gitClient->stashPop(state.topLevel());
break;
case GitClient::NotStashed:
......
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