diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-07-10 07:34:18 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-07-11 12:52:06 +0200 |
| commit | 457b5e2969633349a33234b9788abe73a6d9fee1 (patch) | |
| tree | f30ec83f6ae4559e3468bc155c5d9a8b28f97d2c /src/plugins/git/branchdialog.cpp | |
| parent | d31efc22e8758916f5d31b02d1a17625eba6b429 (diff) | |
| download | qt-creator-457b5e2969633349a33234b9788abe73a6d9fee1.tar.gz | |
Git: Prevent double stash pop on branch checkout
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>
Diffstat (limited to 'src/plugins/git/branchdialog.cpp')
| -rw-r--r-- | src/plugins/git/branchdialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp index d7403dd106..8fc07d8e0d 100644 --- a/src/plugins/git/branchdialog.cpp +++ b/src/plugins/git/branchdialog.cpp @@ -215,7 +215,7 @@ void BranchDialog::checkout() } if (!stashMessage.isEmpty() && branchCheckoutDialog.moveLocalChangesToNextBranch()) - gitClient->stashPop(m_repository); + gitClient->endStashScope(m_repository); else if (branchCheckoutDialog.popStashOfNextBranch()) gitClient->synchronousStashRestore(m_repository, stashName, true); } |