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

Git: Show current branch even if it is obsolete

Browse Source 
Change-Id: I694284c359812d9d0030fcdd934af4b98722aaa0
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2016-05-13 15:43:57 +03:00
committed by Orgad Shaneh
parent e195c87299
commit 43f8f04ed6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/branchmodel.cpp
View File

@@ -649,7 +649,8 @@ void BranchModel::parseOutputLine(const QString &line)
const QString fullName = lineParts.at(1);
const QString upstream = lineParts.at(2);
if (!m_oldBranchesIncluded) {
const bool current = (sha == m_currentSha);
if (!m_oldBranchesIncluded && !current) {
QString strDateTime = lineParts.at(5);
if (strDateTime.isEmpty())
strDateTime = lineParts.at(4);
@@ -660,7 +661,6 @@ void BranchModel::parseOutputLine(const QString &line)
return;
}
}
bool current = (sha == m_currentSha);
bool showTags = m_client->settings().boolValue(GitSettings::showTagsKey);
// insert node into tree: