From: Johannes Sixt <j6t@kdbg.org>
Date: Fri, 20 Mar 2026 08:07:09 +0000 (+0100)
Subject: Merge branch 'sb/heed-ref-decoration-settings'
X-Git-Tag: v2.54.0-rc0~54^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=696e001e125ad99f765988f2eb06904558eb5078;p=thirdparty%2Fgit.git

Merge branch 'sb/heed-ref-decoration-settings'

* sb/heed-ref-decoration-settings:
  gitk: use config settings for head/tag colors
---

696e001e125ad99f765988f2eb06904558eb5078
diff --cc gitk
index 1c289174d5,0415abd873..2730274966
--- a/gitk
+++ b/gitk
@@@ -6840,8 -6842,8 +6842,8 @@@ proc drawtags {id x xt y1} 
              }
              set xl [expr {$xl - $delta/2}]
              $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
-                 -width 1 -outline black -fill $col -tags tag.$id
+                 -width 1 -outline $refoutlinecol -fill $reffillcol -tags tag.$id
 -            if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
 +            if {[regexp {^(remotes/[^/]*/|remotes/)} $tag match remoteprefix]} {
                  set rwid [font measure mainfont $remoteprefix]
                  set xi [expr {$x + 1}]
                  set yti [expr {$yt + 1}]