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

Merge remote-tracking branch 'origin/2.5'

Browse Source
This commit is contained in:
Eike Ziller
2012-03-05 13:48:48 +01:00
parent 0d079a6339 bf993e1fda
commit 9c9316b9e7
27 changed files with 791 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -793,14 +793,14 @@ void GitPlugin::fetch()
void GitPlugin::pull()
{
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return)
QTC_ASSERT(state.hasTopLevel(), return);
switch (m_gitClient->ensureStash(state.topLevel())) {
case GitClient::StashUnchanged:
case GitClient::Stashed:
case GitClient::NotStashed:
m_gitClient->synchronousPull(state.topLevel());
default:
case GitClient::StashUnchanged:
case GitClient::Stashed:
case GitClient::NotStashed:
m_gitClient->synchronousPull(state.topLevel());
default:
break;
}
}