From 5a562e9239998fd9a3980d34f6326efaab2d75a6 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Fri, 14 Feb 2014 10:26:18 +0200
Subject: [PATCH] PushToGerrit: Pass local branch to determineRemoteBranch

Simpler

Change-Id: Ice180200a1b78e57b8ff6b246db7b2e8f3b39eb1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/git/gerrit/gerritpushdialog.cpp | 13 ++++++-------
 src/plugins/git/gerrit/gerritpushdialog.h   |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp
index ed1496f6120..82a60cfed83 100644
--- a/src/plugins/git/gerrit/gerritpushdialog.cpp
+++ b/src/plugins/git/gerrit/gerritpushdialog.cpp
@@ -59,7 +59,7 @@ protected:
     }
 };
 
-QString GerritPushDialog::determineRemoteBranch()
+QString GerritPushDialog::determineRemoteBranch(const QString &localBranch)
 {
     const QString earliestCommit = m_ui->commitView->earliestCommit();
 
@@ -74,11 +74,10 @@ QString GerritPushDialog::determineRemoteBranch()
     const QString head = QLatin1String("/HEAD");
     QStringList refs = output.split(QLatin1Char('\n'));
 
-    QString localBranch = m_ui->localBranchComboBox->currentText();
-    if (localBranch == QLatin1String("HEAD"))
-        localBranch.clear();
-    const QString remoteTrackingBranch = m_client->synchronousTrackingBranch(m_workingDir,
-                                                                             localBranch);
+    QString remoteTrackingBranch;
+    if (localBranch != QLatin1String("HEAD"))
+        remoteTrackingBranch = m_client->synchronousTrackingBranch(m_workingDir, localBranch);
+
     QString remoteBranch;
     foreach (const QString &reference, refs) {
         const QString ref = reference.trimmed();
@@ -252,7 +251,7 @@ void GerritPushDialog::updateCommits(int index)
     const bool hasLocalCommits = m_ui->commitView->init(m_workingDir, branch,
                                                         LogChangeWidget::Silent);
 
-    const QString remoteBranch = determineRemoteBranch();
+    const QString remoteBranch = determineRemoteBranch(branch);
     if (!remoteBranch.isEmpty()) {
         const int slash = remoteBranch.indexOf(QLatin1Char('/'));
 
diff --git a/src/plugins/git/gerrit/gerritpushdialog.h b/src/plugins/git/gerrit/gerritpushdialog.h
index e21bddd4848..35f493c1b13 100644
--- a/src/plugins/git/gerrit/gerritpushdialog.h
+++ b/src/plugins/git/gerrit/gerritpushdialog.h
@@ -68,7 +68,7 @@ private:
     typedef QPair<QString, QDate> BranchDate;
     typedef QMultiMap<QString, BranchDate> RemoteBranchesMap;
 
-    QString determineRemoteBranch();
+    QString determineRemoteBranch(const QString &localBranch);
     void initRemoteBranches();
     QString calculateChangeRange(const QString &branch);
     QString m_workingDir;