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

Git: Fix calls to ensureStash

Browse Source 
Change-Id: I581afbe314055796d22f883e501dfb5fd17117fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-01-23 17:01:19 +02:00
committed by Tobias Hunger
parent 4e5e6b45fe
commit e463c56c32
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/branchmodel.cpp
View File

@@ -444,7 +444,7 @@ void BranchModel::checkoutBranch(const QModelIndex &idx)
return; return;
QString errorMessage; 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::StashUnchanged:
case GitClient::Stashed: case GitClient::Stashed:
case GitClient::NotStashed: case GitClient::NotStashed:

2
src/plugins/git/gitclient.cpp
View File

@@ -1571,7 +1571,7 @@ static inline int askWithDetailedText(QWidget *parent,
GitClient::StashResult GitClient::ensureStash(const QString &workingDirectory, const QString &keyword, QString *message) GitClient::StashResult GitClient::ensureStash(const QString &workingDirectory, const QString &keyword, QString *message)
{ {
QString errorMessage; QString errorMessage;
const StashResult sr = ensureStash(workingDirectory, keyword, message, &errorMessage); const StashResult sr = ensureStash(workingDirectory, keyword, true, message, &errorMessage);
if (sr == StashFailed) if (sr == StashFailed)
outputWindow()->appendError(errorMessage); outputWindow()->appendError(errorMessage);
return sr; return sr;