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

Git: If stashed before pull, stash pop after it

Browse Source 
Change-Id: Ie983df1ffadac27551bbc51199784c0bc8610c14
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Orgad Shaneh
2012-06-25 14:46:15 +03:00
committed by Tobias Hunger
parent 616cb86ea7
commit ad7874ed87
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/git/gitplugin.cpp
View File

@@ -787,10 +787,13 @@ void GitPlugin::pull()
QTC_ASSERT(state.hasTopLevel(), return); QTC_ASSERT(state.hasTopLevel(), return);
const bool rebase = m_gitClient->settings()->boolValue(GitSettings::pullRebaseKey); const bool rebase = m_gitClient->settings()->boolValue(GitSettings::pullRebaseKey);
switch (m_gitClient->ensureStash(state.topLevel())) { GitClient::StashResult stashResult = m_gitClient->ensureStash(state.topLevel());
switch (stashResult) {
case GitClient::StashUnchanged: case GitClient::StashUnchanged:
case GitClient::Stashed: case GitClient::Stashed:
m_gitClient->synchronousPull(state.topLevel(), rebase); m_gitClient->synchronousPull(state.topLevel(), rebase);
if (stashResult == GitClient::Stashed)
m_gitClient->stashPop(state.topLevel());
break; break;
case GitClient::NotStashed: case GitClient::NotStashed:
if (!rebase) if (!rebase)