From: Michael Rappazzo <michael.rappazzo@infor.com>
Date: Thu, 31 Jul 2025 11:53:21 +0000 (-0400)
Subject: gitk: filter invisible upstream refs from reference list
X-Git-Tag: v2.51.0-rc1~10^2~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9965cc771b6b43a8852a4950a196180f2c616891;p=thirdparty%2Fgit.git

gitk: filter invisible upstream refs from reference list

In refill_reflist, upstream refs are now only included if their
commits are visible in the current view. This prevents display
issues like multiple highlighted branches when clicking entries.

Signed-off-by: Michael Rappazzo <michael.rappazzo@infor.com>
---

diff --git a/gitk b/gitk
index b31d0b0a63..080192820e 100755
--- a/gitk
+++ b/gitk
@@ -10332,7 +10332,7 @@ proc refill_reflist {} {
         if {![string match "remotes/*" $n] && [string match $reflistfilter $n]} {
             if {[commitinview $headids($n) $curview]} {
                 lappend localrefs [list $n H]
-                if {[info exists upstreamofref($n)]} {
+                if {[info exists upstreamofref($n)] && [commitinview $headids($upstreamofref($n)) $curview]} {
                     lappend trackedremoterefs [list $upstreamofref($n) R]
                 }
             } else {