From aad68917b92f1dee4f09c9c4b0d102f04558b39c Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Fri, 5 Jul 2013 17:37:58 +0300
Subject: Git: Always allow stash before cherry-pick/revert

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>
---
 src/plugins/git/gitplugin.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/plugins/git/gitplugin.cpp')

diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 917a47a39c..450a0ddf94 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -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);
 }
 
-- 
cgit v1.2.1