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

Git: Pop stored stash after checkout

Browse Source 
Change-Id: I41eda91149c0152fd0b9f3d2c0294120153377b5
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
This commit is contained in:
Orgad Shaneh
2014-01-15 07:57:31 +02:00
committed by Orgad Shaneh
parent fc85a4766d
commit 5eff132253
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -900,9 +900,7 @@ void GitPlugin::startChangeRelatedAction()
m_gitClient->synchronousRevert(workingDirectory, change);
break;
case Checkout:
if (!m_gitClient->beginStashScope(workingDirectory, QLatin1String("Checkout")))
return;
m_gitClient->synchronousCheckout(workingDirectory, change);
m_gitClient->stashAndCheckout(workingDirectory, QLatin1String("Checkout"));
break;
default:
return;