diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-03-19 19:10:04 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-03-20 12:15:40 +0100 |
| commit | 9b22c8ed62a27fe9a249cf3528c20a3dc159175e (patch) | |
| tree | 8b738b6a0d5a9321cad1c61cc2ecadcbc349a55b | |
| parent | 4d4883450d8f8b1f3adfcbd0fca8c6f981de2cf9 (diff) | |
Revert "Git: Undo changes on pull with rebase when user chooses not to stash"
The dialog text doesn't state that the changes will be
discarded. This is likely to be an unexpected behavior.
Will improve the dialog on master
This reverts commit cf41cd5e2a9b1927fd533789a30cfd80a4e0791e
Task-number: QTCREATORBUG-7031
Change-Id: I52eaf3cdef1b10b261ee9d2e9e14aa98e6e32bdd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| -rw-r--r-- | src/plugins/git/gitplugin.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index bcfeb76c01..ebdebda0b9 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -976,10 +976,8 @@ void GitPlugin::pull() } GitClient::StashGuard stashGuard(topLevel, QLatin1String("Pull")); - if (stashGuard.stashingFailed(false)) + if (stashGuard.stashingFailed(false) || (rebase && (stashGuard.result() == GitClient::NotStashed))) return; - if (rebase && (stashGuard.result() == GitClient::NotStashed)) - m_gitClient->synchronousCheckoutFiles(topLevel); if (!m_gitClient->synchronousPull(topLevel, rebase)) stashGuard.preventPop(); } |