From 9b22c8ed62a27fe9a249cf3528c20a3dc159175e Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 19 Mar 2013 19:10:04 +0200
Subject: [PATCH] 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>
---
src/plugins/git/gitplugin.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index bcfeb76c01e..ebdebda0b95 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();
}
--
GitLab