global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-06 23:37:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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>
This commit is contained in:
Johannes Sixt
2025-08-01 18:35:16 +02:00
parent 2d3f3f0127 9965cc771b
commit f896039388
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gitk
View File

@@ -10238,7 +10238,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 {
@@ -10246,7 +10246,7 @@ proc 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] {