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

Git: Improve branch name validation

Browse Source 
* Do not allow leading dash
* Do not allow existing local branches

Change-Id: I3efbb90b7099719a7e90cada85a58a0f91bd9730
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-10-07 10:26:13 +03:00
committed by Orgad Shaneh
parent 5e585b9eee
commit 2559f98693
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,7 +154,7 @@ void BranchDialog::add()
++i;
}
BranchAddDialog branchAddDialog(true, this);
BranchAddDialog branchAddDialog(localNames, true, this);
branchAddDialog.setBranchName(suggestedName);
branchAddDialog.setTrackedBranchName(isTag ? QString() : trackedBranch, !isLocal);
@@ -276,7 +276,7 @@ void BranchDialog::rename()
if (!isTag)
localNames = m_model->localBranchNames();
BranchAddDialog branchAddDialog(false, this);
BranchAddDialog branchAddDialog(localNames, false, this);
if (isTag)
branchAddDialog.setWindowTitle(tr("Rename Tag"));
branchAddDialog.setBranchName(oldName);
@@ -287,12 +287,6 @@ void BranchDialog::rename()
if (branchAddDialog.result() == QDialog::Accepted && m_model) {
if (branchAddDialog.branchName() == oldName)
return;
if (localNames.contains(branchAddDialog.branchName())) {
QMessageBox::critical(this, tr("Branch Exists"),
tr("Local branch \'%1\' already exists.")
.arg(branchAddDialog.branchName()));
return;
}
if (isTag)
m_model->renameTag(oldName, branchAddDialog.branchName());
else