From 5d1d2d2b626089bf8c2710352ebddb9f3b8d8c8e Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 28 Jul 2013 16:12:07 +0300 Subject: [PATCH] Git: Fix autostash for branches Broken by 771fe03cfeda0b8514556ca29889fb35116a41c5 Change-Id: Ifb629535d2197bbee771050c94952068834614f3 Reviewed-by: Petar Perisin --- src/plugins/git/branchdialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp index 11459f3a31e..2e299511e35 100644 --- a/src/plugins/git/branchdialog.cpp +++ b/src/plugins/git/branchdialog.cpp @@ -193,8 +193,8 @@ void BranchDialog::checkout() } else if (branchCheckoutDialog.exec() == QDialog::Accepted && m_model) { if (branchCheckoutDialog.makeStashOfCurrentBranch()) { - if (!gitClient->executeSynchronousStash(m_repository, - currentBranch + QLatin1String("-AutoStash"))) { + if (gitClient->synchronousStash(m_repository, + currentBranch + QLatin1String("-AutoStash")).isEmpty()) { return; } } else if (branchCheckoutDialog.moveLocalChangesToNextBranch()) {