diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2013-01-20 01:03:02 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-01-23 14:11:47 +0100 |
| commit | b6a9d58f690834c7629762a21e520f72a282d2a8 (patch) | |
| tree | 7ad705e55ac7664595bc7b22c6bd5f7ea5c70c8c /src/plugins/git/branchdialog.cpp | |
| parent | 3898effa688929d84cebbba77f7965d343318735 (diff) | |
| download | qt-creator-b6a9d58f690834c7629762a21e520f72a282d2a8.tar.gz | |
Git: Fix issues in the branch dialog
* Split part/next/last into a 'part' node and a 'next/last' node
instead of 'part/next' and 'last' node. This is closer to what git does.
* Fix some model-issues along the way;)
* Unhighlight remote checked-out branches again once they are no longer
the current one.
* Remove stale nodes after removing a branch. When removing 'first/next'
kind of branches, do not keep a empty 'first' in the tree.
Task-number: QTCREATORBUG-8518
Change-Id: Ia5650540aa58354aaab513199c8622392bdbd37f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Diffstat (limited to 'src/plugins/git/branchdialog.cpp')
| -rw-r--r-- | src/plugins/git/branchdialog.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp index bf36548700..65132e6d5a 100644 --- a/src/plugins/git/branchdialog.cpp +++ b/src/plugins/git/branchdialog.cpp @@ -82,8 +82,6 @@ BranchDialog::BranchDialog(QWidget *parent) : BranchDialog::~BranchDialog() { delete m_ui; - delete m_model; - m_model = 0; } void BranchDialog::refresh(const QString &repository, bool force) @@ -160,7 +158,6 @@ void BranchDialog::add() void BranchDialog::checkout() { QModelIndex idx = selectedIndex(); - QTC_CHECK(m_model->isLocal(idx)); const QString currentBranch = m_model->branchName(m_model->currentBranch()); const QString nextBranch = m_model->branchName(idx); |