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

Revert "Git: Undo changes on pull with rebase when user chooses not to stash"

Browse Source 
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>
This commit is contained in:
Orgad Shaneh
2013-03-19 19:10:04 +02:00
committed by Eike Ziller
parent 4d4883450d
commit 9b22c8ed62
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();
}