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

Git: Always allow stash before cherry-pick/revert

Browse Source 
Currently done only from "Actions on Commits"

Change-Id: Ide34e198e72f554ba6fd75ef21aaaf35917b4f6a
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-07-05 17:37:58 +03:00
committed by Orgad Shaneh
parent 8aa1c9bc37
commit aad68917b9
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -857,28 +857,23 @@ void GitPlugin::startChangeRelatedAction()
if (!ensureAllDocumentsSaved())
return;
QString command;
bool (GitClient::*commandFunction)(const QString&, const QString&);
switch (dialog.command()) {
case CherryPick:
command = QLatin1String("Cherry-pick");
commandFunction = &GitClient::synchronousCherryPick;
break;
case Revert:
command = QLatin1String("Revert");
commandFunction = &GitClient::synchronousRevert;
break;
case Checkout:
command = QLatin1String("Checkout");
if (!m_gitClient->beginStashScope(workingDirectory, QLatin1String("Checkout")))
return;
commandFunction = &GitClient::synchronousCheckout;
break;
default:
return;
}
if (!m_gitClient->beginStashScope(workingDirectory, command))
return;
(m_gitClient->*commandFunction)(workingDirectory, change);
}