Merge branch 'mr/sort-refs-by-type'

j6t · j6t · commit f896039388e0 · 2025-08-01T18:35:16.000+02:00
* mr/sort-refs-by-type:
  gitk: filter invisible upstream refs from reference list
  gitk: avoid duplicated upstream refs

Signed-off-by: Johannes Sixt &lt;j6t@kdbg.org&gt;
diff --git a/gitk b/gitk
@@ -10238,15 +10238,15 @@ 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 {
                 interestedin $headids($n) {run refill_reflist}
             }
         }
     }
-    set trackedremoterefs [lsort -index 0 $trackedremoterefs]
+    set trackedremoterefs [lsort -index 0 -unique $trackedremoterefs]
     set localrefs [lsort -index 0 $localrefs]
 
     foreach n [array names headids] {

Original file line number	Diff line number	Diff line change
`@@ -10238,15 +10238,15 @@ proc refill_reflist {} {`
`10238`	`10238`	`if {![string match "remotes/*" $n] && [string match $reflistfilter $n]} {`
`10239`	`10239`	`if {[commitinview $headids($n) $curview]} {`
`10240`	`10240`	`lappend localrefs [list $n H]`
`10241`		`- if {[info exists upstreamofref($n)]} {`
	`10241`	`+ if {[info exists upstreamofref($n)] && [commitinview $headids($upstreamofref($n)) $curview]} {`
`10242`	`10242`	`lappend trackedremoterefs [list $upstreamofref($n) R]`
`10243`	`10243`	`}`
`10244`	`10244`	`} else {`
`10245`	`10245`	`interestedin $headids($n) {run refill_reflist}`
`10246`	`10246`	`}`
`10247`	`10247`	`}`
`10248`	`10248`	`}`
`10249`		`- set trackedremoterefs [lsort -index 0 $trackedremoterefs]`
	`10249`	`+ set trackedremoterefs [lsort -index 0 -unique $trackedremoterefs]`
`10250`	`10250`	`set localrefs [lsort -index 0 $localrefs]`
`10251`	`10251`
`10252`	`10252`	`foreach n [array names headids] {`