Git: Do not suggest tag name for local branch

This causes unnecessary name ambiguity.

Change-Id: Id27060edb19b4902f2a93da042eb8389754b8e04
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp
index 2531867dcb..d3eceed608 100644
--- a/src/plugins/git/branchdialog.cpp
+++ b/src/plugins/git/branchdialog.cpp
@@ -152,12 +152,16 @@ void BranchDialog::add()
 
     QStringList localNames = m_model->localBranchNames();
 
-    QString suggestedNameBase = trackedBranch.mid(trackedBranch.lastIndexOf(QLatin1Char('/')) + 1);
-    QString suggestedName = suggestedNameBase;
-    int i = 2;
-    while (localNames.contains(suggestedName)) {
-        suggestedName = suggestedNameBase + QString::number(i);
-        ++i;
+    QString suggestedName;
+    if (!isTag) {
+        QString suggestedNameBase;
+        suggestedNameBase = trackedBranch.mid(trackedBranch.lastIndexOf(QLatin1Char('/')) + 1);
+        suggestedName = suggestedNameBase;
+        int i = 2;
+        while (localNames.contains(suggestedName)) {
+            suggestedName = suggestedNameBase + QString::number(i);
+            ++i;
+        }
     }
 
     BranchAddDialog branchAddDialog(localNames, true, this);