Merge branch '2.3'

Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4

4 files changed, 9 insertions, 5 deletions

diff --git a/src/plugins/git/branchadddialog.cpp b/src/plugins/git/branchadddialog.cpp
index 4a4981f2ab..2579fbb3d9 100644
--- a/src/plugins/git/branchadddialog.cpp
+++ b/src/plugins/git/branchadddialog.cpp
@@ -72,7 +72,7 @@ void BranchAddDialog::setTrackedBranchName(const QString &name, bool remote)
 
 bool BranchAddDialog::track()
 {
-    return m_ui->trackingCheckBox->isVisible() && m_ui->trackingCheckBox->isChecked();
+    return m_ui->trackingCheckBox->isChecked();
 }
 
 } // namespace Internal
diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp
index cb57a34417..2efb245022 100644
--- a/src/plugins/git/branchdialog.cpp
+++ b/src/plugins/git/branchdialog.cpp
@@ -154,6 +154,7 @@ void BranchDialog::checkout()
     Q_ASSERT(m_model->isLocal(idx));
 
     m_model->checkoutBranch(idx);
+    enableButtons();
 }
 
 /* Prompt to delete a local branch and do so. */
diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp
index 428ddf3e6a..5d1712aeee 100644
--- a/src/plugins/git/branchmodel.cpp
+++ b/src/plugins/git/branchmodel.cpp
@@ -470,15 +470,18 @@ bool BranchModel::branchIsMerged(const QModelIndex &idx)
     QString output;
     QStringList args;
 
-    args << QLatin1String("--contains") << sha(idx);
+    args << QLatin1String("-a") << QLatin1String("--contains") << sha(idx);
     if (!m_client->synchronousBranchCmd(m_workingDirectory, args, &output, &errorMessage)) {
         VCSBase::VCSBaseOutputWindow::instance()->appendError(errorMessage);
         return false;
     }
 
-    QStringList lines = output.split(QLatin1Char('/'), QString::SkipEmptyParts);
+    QStringList lines = output.split(QLatin1Char('\n'), QString::SkipEmptyParts);
     foreach (const QString &l, lines) {
-        if (l.startsWith(QLatin1String("  ")) && l.count() >= 3)
+        QString currentBranch = l.mid(2); // remove first letters (those are either
+                                          // "  " or "* " depending on whether it is
+                                          // the currently checked out branch or not)
+        if (currentBranch != branch)
             return true;
     }
     return false;
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index e7f4807d4b..1bd5f363c7 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -1441,7 +1441,7 @@ GitCommand *GitClient::createCommand(const QString &workingDirectory,
             connect(command, SIGNAL(outputData(QByteArray)), outputWindow, SLOT(appendData(QByteArray)));
         }
     } else {
-        QTC_ASSERT(editor, /**/);
+        QTC_CHECK(editor);
         connect(command, SIGNAL(outputData(QByteArray)), editor, SLOT(setPlainTextDataFiltered(QByteArray)));
     }