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

Git: Use stash pop instead of apply...

Browse Source 
... when the stash should be removed on successful pop

Change-Id: I39b2c01b0a518d3c70bcb8dc898191cca6d3e84d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-01-22 21:02:20 +02:00
committed by Orgad Shaneh
parent 53443616e5
commit daef1fbb88
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,10 +207,7 @@ void BranchDialog::checkout()
if (!stashMessage.isEmpty() && branchCheckoutDialog.moveLocalChangesToNextBranch())
gitClient->stashPop(m_repository);
else if (branchCheckoutDialog.popStashOfNextBranch())
gitClient->synchronousStashRestore(m_repository, stashName);
if (branchCheckoutDialog.hasStashForNextBranch())
gitClient->synchronousStashRemove(m_repository, stashName);
gitClient->synchronousStashRestore(m_repository, stashName, true);
}
enableButtons();
}