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

Git: Fix autostash for branches

Browse Source 
Broken by 771fe03cfe

Change-Id: Ifb629535d2197bbee771050c94952068834614f3
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
This commit is contained in:
Orgad Shaneh
2013-07-28 16:12:07 +03:00
committed by Orgad Shaneh
parent b0283de055
commit 5d1d2d2b62
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,8 +193,8 @@ void BranchDialog::checkout()
} else if (branchCheckoutDialog.exec() == QDialog::Accepted && m_model) { } else if (branchCheckoutDialog.exec() == QDialog::Accepted && m_model) {
if (branchCheckoutDialog.makeStashOfCurrentBranch()) { if (branchCheckoutDialog.makeStashOfCurrentBranch()) {
if (!gitClient->executeSynchronousStash(m_repository, if (gitClient->synchronousStash(m_repository,
currentBranch + QLatin1String("-AutoStash"))) { currentBranch + QLatin1String("-AutoStash")).isEmpty()) {
return; return;
} }
} else if (branchCheckoutDialog.moveLocalChangesToNextBranch()) { } else if (branchCheckoutDialog.moveLocalChangesToNextBranch()) {