freshlybakedca.ke
Git fork
Merge branch 'mr/sort-refs-by-type'
* mr/sort-refs-by-type:
gitk: filter invisible upstream refs from reference list
gitk: avoid duplicated upstream refs
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
+2
-2
+2
-2
gitk
+2
-2
gitk
···
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 {
···
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] {