diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-01-23 17:01:19 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-01-23 17:56:57 +0100 |
commit | e463c56c32ce20fd39992e0b16b07569477256bc (patch) | |
tree | 8364f8d501b21d50dc7cea523f98b09880c07597 | |
parent | 4e5e6b45feeed9988b65c3a7f9c92c30ed030276 (diff) | |
download | qt-creator-e463c56c32ce20fd39992e0b16b07569477256bc.tar.gz |
Git: Fix calls to ensureStash
Change-Id: I581afbe314055796d22f883e501dfb5fd17117fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
-rw-r--r-- | src/plugins/git/branchmodel.cpp | 2 | ||||
-rw-r--r-- | src/plugins/git/gitclient.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp index 5de518fb99..4a0c1af46f 100644 --- a/src/plugins/git/branchmodel.cpp +++ b/src/plugins/git/branchmodel.cpp @@ -444,7 +444,7 @@ void BranchModel::checkoutBranch(const QModelIndex &idx) return; QString errorMessage; - switch (m_client->ensureStash(m_workingDirectory, QLatin1String("Branch-Checkout"), 0, &errorMessage)) { + switch (m_client->ensureStash(m_workingDirectory, QLatin1String("Branch-Checkout"), true, 0, &errorMessage)) { case GitClient::StashUnchanged: case GitClient::Stashed: case GitClient::NotStashed: diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 4e6a7e847d..f1418121a6 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1571,7 +1571,7 @@ static inline int askWithDetailedText(QWidget *parent, GitClient::StashResult GitClient::ensureStash(const QString &workingDirectory, const QString &keyword, QString *message) { QString errorMessage; - const StashResult sr = ensureStash(workingDirectory, keyword, message, &errorMessage); + const StashResult sr = ensureStash(workingDirectory, keyword, true, message, &errorMessage); if (sr == StashFailed) outputWindow()->appendError(errorMessage); return sr; |