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

Git: Prevent tracking tags

Browse Source 
Change-Id: Iea935aa226b70de936653b7637b4b9bb5e9c64cf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-06-19 06:12:08 +03:00
committed by Orgad Shaneh
parent 11e7c706be
commit 57a6f04ce6
4 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,12 +124,14 @@ QString BranchAddDialog::branchName() const
void BranchAddDialog::setTrackedBranchName(const QString &name, bool remote)
{
m_ui->trackingCheckBox->setVisible(true);
if (!name.isEmpty())
if (!name.isEmpty()) {
m_ui->trackingCheckBox->setText(remote ? tr("Track remote branch \'%1\'").arg(name) :
tr("Track local branch \'%1\'").arg(name));
else
m_ui->trackingCheckBox->setChecked(remote);
} else {
m_ui->trackingCheckBox->setVisible(false);
m_ui->trackingCheckBox->setChecked(remote);
m_ui->trackingCheckBox->setChecked(false);
}
}
bool BranchAddDialog::track()