From: Michael Rappazzo <rappazzo@gmail.com>
Date: Sat, 13 Sep 2025 11:31:51 +0000 (-0400)
Subject: gitk: fix error when remote tracking branch is deleted
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88189dd7cb535486b74bcf50997253797f4b999c;p=thirdparty%2Fgit.git

gitk: fix error when remote tracking branch is deleted

When a remote tracking branch is deleted (e.g., via 'git push --delete
origin branch'), the headids array entry for that branch is removed, but
upstreamofref may still reference it. This causes gitk to show an error
and prevents the Tags and Heads view from opening.

Fix by checking that headids($upstreamofref($n)) exists before accessing
it in the refill_reflist function.

Signed-off-by: Michael Rappazzo <rappazzo@gmail.com>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---

diff --git a/gitk b/gitk
index 080192820e..fc502fbd68 100755
--- a/gitk
+++ b/gitk
@@ -10332,7 +10332,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 {