From 42bbae26a3e179e5a75684a8ca52f0c30f078a8e Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 3 Aug 2014 11:49:51 +0300 Subject: [PATCH] Git: Do not suggest tag name for local branch This causes unnecessary name ambiguity. Change-Id: Id27060edb19b4902f2a93da042eb8389754b8e04 Reviewed-by: Friedemann Kleint --- src/plugins/git/branchdialog.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp index 2531867dcba..d3eceed6084 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);