global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 18:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* mr/sort-refs-by-type:
  gitk: fix error when remote tracking branch is deleted
This commit is contained in:
Johannes Sixt
2025-10-04 15:36:12 +02:00
parent ac8fec7d8d 88189dd7cb
commit d7cedce063
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gitk
View File

@@ -10294,7 +10294,9 @@ 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)] && [commitinview $headids($upstreamofref($n)) $curview]} {
if {[info exists upstreamofref($n)] && \
[info exists headids($upstreamofref($n))] && \
[commitinview $headids($upstreamofref($n)) $curview]} {
lappend trackedremoterefs [list $upstreamofref($n) R]
}
} else {