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

Git: Display tracking branch for newly created branches

Browse Source 
+ Get rid of a workaround done for retrieving sha

Change-Id: I4b7a6c6d9e9be5766f4fc540dc8b15037eb7948c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-06-17 14:44:03 +03:00
committed by Orgad Shaneh
parent 40f3efbc21
commit 744d5d51ab
3 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,12 +121,13 @@ void BranchDialog::refresh()
void BranchDialog::add()
{
QString trackedBranch = m_model->branchName(selectedIndex());
bool isLocal = m_model->isLocal(selectedIndex());
QModelIndex trackedIndex = selectedIndex();
QString trackedBranch = m_model->branchName(trackedIndex);
if (trackedBranch.isEmpty()) {
trackedBranch = m_model->branchName(m_model->currentBranch());
isLocal = true;
trackedIndex = m_model->currentBranch();
trackedBranch = m_model->branchName(trackedIndex);
}
const bool isLocal = m_model->isLocal(trackedIndex);
QStringList localNames = m_model->localBranchNames();
@@ -143,7 +144,7 @@ void BranchDialog::add()
branchAddDialog.setTrackedBranchName(trackedBranch, !isLocal);
if (branchAddDialog.exec() == QDialog::Accepted && m_model) {
QModelIndex idx = m_model->addBranch(branchAddDialog.branchName(), branchAddDialog.track(), trackedBranch);
QModelIndex idx = m_model->addBranch(branchAddDialog.branchName(), branchAddDialog.track(), trackedIndex);
m_ui->branchView->selectionModel()->select(idx, QItemSelectionModel::Clear
| QItemSelectionModel::Select
| QItemSelectionModel::Current);