Git: Display tracking branch for newly created branches

+ Get rid of a workaround done for retrieving sha

Change-Id: I4b7a6c6d9e9be5766f4fc540dc8b15037eb7948c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp
index 848fb293e9..d4b68d74d5 100644
--- a/src/plugins/git/branchdialog.cpp
+++ b/src/plugins/git/branchdialog.cpp
@@ -121,12 +121,13 @@ void BranchDialog::refresh()
 
 void BranchDialog::add()
 {
-    QString trackedBranch = m_model->branchName(selectedIndex());
-    bool isLocal = m_model->isLocal(selectedIndex());
+    QModelIndex trackedIndex = selectedIndex();
+    QString trackedBranch = m_model->branchName(trackedIndex);
     if (trackedBranch.isEmpty()) {
-        trackedBranch = m_model->branchName(m_model->currentBranch());
-        isLocal = true;
+        trackedIndex = m_model->currentBranch();
+        trackedBranch = m_model->branchName(trackedIndex);
     }
+    const bool isLocal = m_model->isLocal(trackedIndex);
 
     QStringList localNames = m_model->localBranchNames();
 
@@ -143,7 +144,7 @@ void BranchDialog::add()
     branchAddDialog.setTrackedBranchName(trackedBranch, !isLocal);
 
     if (branchAddDialog.exec() == QDialog::Accepted && m_model) {
-        QModelIndex idx = m_model->addBranch(branchAddDialog.branchName(), branchAddDialog.track(), trackedBranch);
+        QModelIndex idx = m_model->addBranch(branchAddDialog.branchName(), branchAddDialog.track(), trackedIndex);
         m_ui->branchView->selectionModel()->select(idx, QItemSelectionModel::Clear
                                                         | QItemSelectionModel::Select
                                                         | QItemSelectionModel::Current);