From e163356f9f641e38e260132348f53da8b572298a Mon Sep 17 00:00:00 2001
From: Petar Perisin <petar.perisin@gmail.com>
Date: Fri, 24 Jan 2014 06:31:31 +0100
Subject: [PATCH] Git: Branches dialog - ensure all documents are saved

Change-Id: Ia48157b10fb2f9eb3a8b9b8e7e541a736dd75b4f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/git/branchdialog.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp
index 9409c56f98c..7a86cd3ec14 100644
--- a/src/plugins/git/branchdialog.cpp
+++ b/src/plugins/git/branchdialog.cpp
@@ -40,6 +40,7 @@
 #include <utils/qtcassert.h>
 #include <utils/execmenu.h>
 #include <vcsbase/vcsbaseoutputwindow.h>
+#include <coreplugin/documentmanager.h>
 
 #include <QAction>
 #include <QItemSelectionModel>
@@ -177,6 +178,8 @@ void BranchDialog::add()
 
 void BranchDialog::checkout()
 {
+    if (!Core::DocumentManager::saveAllModifiedDocuments())
+        return;
     QModelIndex idx = selectedIndex();
 
     const QString currentBranch = m_model->fullName(m_model->currentBranch());
@@ -319,6 +322,8 @@ void BranchDialog::log()
 
 void BranchDialog::merge()
 {
+    if (!Core::DocumentManager::saveAllModifiedDocuments())
+        return;
     QModelIndex idx = selectedIndex();
     QTC_CHECK(idx != m_model->currentBranch()); // otherwise the button would not be enabled!
 
@@ -340,6 +345,8 @@ void BranchDialog::merge()
 
 void BranchDialog::rebase()
 {
+    if (!Core::DocumentManager::saveAllModifiedDocuments())
+        return;
     QModelIndex idx = selectedIndex();
     QTC_CHECK(idx != m_model->currentBranch()); // otherwise the button would not be enabled!
 
@@ -351,6 +358,8 @@ void BranchDialog::rebase()
 
 void BranchDialog::cherryPick()
 {
+    if (!Core::DocumentManager::saveAllModifiedDocuments())
+        return;
     QModelIndex idx = selectedIndex();
     QTC_CHECK(idx != m_model->currentBranch()); // otherwise the button would not be enabled!