feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Do not suggest tag name for local branch

Browse Source 
This causes unnecessary name ambiguity.

Change-Id: Id27060edb19b4902f2a93da042eb8389754b8e04
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Orgad Shaneh
2014-08-03 11:49:51 +03:00
committed by Orgad Shaneh
parent 117436a65a
commit 42bbae26a3
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/git/branchdialog.cpp
View File

@@ -152,13 +152,17 @@ void BranchDialog::add()
QStringList localNames = m_model->localBranchNames(); QStringList localNames = m_model->localBranchNames();
QString suggestedNameBase = trackedBranch.mid(trackedBranch.lastIndexOf(QLatin1Char('/')) + 1); QString suggestedName;
QString suggestedName = suggestedNameBase; if (!isTag) {
QString suggestedNameBase;
suggestedNameBase = trackedBranch.mid(trackedBranch.lastIndexOf(QLatin1Char('/')) + 1);
suggestedName = suggestedNameBase;
int i = 2; int i = 2;
while (localNames.contains(suggestedName)) { while (localNames.contains(suggestedName)) {
suggestedName = suggestedNameBase + QString::number(i); suggestedName = suggestedNameBase + QString::number(i);
++i; ++i;
} }
}
BranchAddDialog branchAddDialog(localNames, true, this); BranchAddDialog branchAddDialog(localNames, true, this);
branchAddDialog.setBranchName(suggestedName); branchAddDialog.setBranchName(suggestedName);