diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-02-11 14:49:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-11 14:49:53 -0800 |
| commit | 453e7b744aef0d9dab62dac6ab030bb643a2e117 (patch) | |
| tree | a2510c413b5bf37aa1481889dcbdd518e2071f4c /gitk-git/gitk | |
| parent | 6fcee4785280a08e7f271bd015a4dc33753e2886 (diff) | |
| parent | ddae547e3775638c238c11f30120f1e7e763fba8 (diff) | |
| download | git-453e7b744aef0d9dab62dac6ab030bb643a2e117.tar.gz git-453e7b744aef0d9dab62dac6ab030bb643a2e117.zip | |
Merge branch 'master' of https://github.com/j6t/gitk
* 'master' of https://github.com/j6t/gitk:
gitk: fix msgfmt being required
gitk: fix highlighted remote prefix of branches with directories
Diffstat (limited to 'gitk-git/gitk')
| -rwxr-xr-x | gitk-git/gitk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gitk-git/gitk b/gitk-git/gitk index 7f62c8041d..cbaaee994e 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -6841,7 +6841,7 @@ 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 - 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}] |