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

Git: Prevent double stash pop on branch checkout

Browse Source 
when Move Local Changes is selected

Change-Id: I2c52e7fde56020370251c6eb93ed3f342fb8d9d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
This commit is contained in:
Orgad Shaneh
2013-07-10 07:34:18 +03:00
committed by Orgad Shaneh
parent d31efc22e8
commit 457b5e2969
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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