From 457b5e2969633349a33234b9788abe73a6d9fee1 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Wed, 10 Jul 2013 07:34:18 +0300
Subject: [PATCH] Git: Prevent double stash pop on branch checkout

when Move Local Changes is selected

Change-Id: I2c52e7fde56020370251c6eb93ed3f342fb8d9d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
---
 src/plugins/git/branchdialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp
index d7403dd1065..8fc07d8e0de 100644
--- a/src/plugins/git/branchdialog.cpp
+++ b/src/plugins/git/branchdialog.cpp
@@ -215,7 +215,7 @@ void BranchDialog::checkout()
         }
 
         if (!stashMessage.isEmpty() && branchCheckoutDialog.moveLocalChangesToNextBranch())
-            gitClient->stashPop(m_repository);
+            gitClient->endStashScope(m_repository);
         else if (branchCheckoutDialog.popStashOfNextBranch())
             gitClient->synchronousStashRestore(m_repository, stashName, true);
     }