Skip to content

[pull] master from git:master #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Feb 13, 2026
+2 −2
Merged

[pull] master from git:master #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28f96e0
gitk: fix highlighted remote prefix of branches with directories
j6t Jan 14, 2026
97121bb
gitk: fix msgfmt being required
pks-t Feb 5, 2026
ddae547
Merge branch 'pks-meson-fix-missing-msgfmt' of https://github.com/pks…
j6t Feb 5, 2026
453e7b7
Merge branch 'master' of https://github.com/j6t/gitk
gitster Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gitk-git/gitk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}]
Expand Down
2 changes: 1 addition & 1 deletion gitk-git/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ custom_target(
install_dir: get_option('bindir'),
)

if find_program('msgfmt').found()
if find_program('msgfmt', required: false).found()
subdir('po')
endif