summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitversioncontrol.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2013-01-22 21:02:20 +0200
committerOrgad Shaneh <orgads@gmail.com>2013-01-23 14:59:24 +0100
commitdaef1fbb88fd52613f50467acd15b78ca4ed129c (patch)
tree148c6b183aab54cbba7e79b6e7727ce7c8de1e4f /src/plugins/git/gitversioncontrol.cpp
parent53443616e5628ef18bba17e51c5ca6f7ed44b203 (diff)
downloadqt-creator-daef1fbb88fd52613f50467acd15b78ca4ed129c.tar.gz
Git: Use stash pop instead of apply...
... when the stash should be removed on successful pop Change-Id: I39b2c01b0a518d3c70bcb8dc898191cca6d3e84d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/gitversioncontrol.cpp')
-rw-r--r--src/plugins/git/gitversioncontrol.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp
index 013a6c9e1d..752c607ba7 100644
--- a/src/plugins/git/gitversioncontrol.cpp
+++ b/src/plugins/git/gitversioncontrol.cpp
@@ -218,7 +218,7 @@ bool GitVersionControl::vcsRestoreSnapshot(const QString &topLevel, const QStrin
QString stashName;
success = m_client->stashNameFromMessage(topLevel, name, &stashName)
&& m_client->synchronousReset(topLevel)
- && m_client->synchronousStashRestore(topLevel, stashName);
+ && m_client->synchronousStashRestore(topLevel, stashName, true);
}
} while (false);
return success;