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

Git: Disable upstream status for Detached HEAD

Browse Source 
It was always zero as Detached HEAD is a special
branch that is not actively queried. It can be
enabled later, but the quick fix is to disable it.

Change-Id: Ib191e1b5551a13bc4911184e12e06a0b4dc28ddf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Andre Hartmann
2024-02-11 12:34:02 +01:00
committed by André Hartmann
parent d9eeddfad1
commit c22471d316
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -318,8 +318,11 @@ QVariant BranchModel::data(const QModelIndex &index, int role) const
if (!node->isLocal() || !node->isLeaf()) if (!node->isLocal() || !node->isLeaf())
break; break;
if (node->status.ahead >= 0)
res += ' ' + arrowUp + QString::number(node->status.ahead); res += ' ' + arrowUp + QString::number(node->status.ahead);
if (!node->tracking.isEmpty()) { if (!node->tracking.isEmpty()) {
if (node->status.behind >= 0)
res += ' ' + arrowDown + QString::number(node->status.behind); res += ' ' + arrowDown + QString::number(node->status.behind);
res += " [" + node->tracking + ']'; res += " [" + node->tracking + ']';
} }

4
src/plugins/git/gitclient.h
View File

@@ -73,8 +73,8 @@ public:
UpstreamStatus() = default; UpstreamStatus() = default;
UpstreamStatus(int ahead, int behind) : ahead(ahead), behind(behind) {} UpstreamStatus(int ahead, int behind) : ahead(ahead), behind(behind) {}
int ahead = 0; int ahead = -1;
int behind = 0; int behind = -1;
}; };
struct Author { struct Author {