[pull] master from git:master#165
Merged
pull[bot] merged 4 commits intoturkdevops:masterfrom Feb 13, 2026
Merged
Conversation
The decoration of a remote ref is colored in two parts: (1) the prefix that mentions the remove (including "remote/"); and (2) the branch name. To extract the prefix from the ref name, a regular expression is used. However, the expression is not restrictive enough: it picks everything before the last slash character as prefix, so that, for example, the ref name "remotes/orgin/ml/themes" is split into "remotes/origin/ml" and "themes". Tighten the regular expression so that only the name of the remote is pulled into the prefix, but no part of the branch name. This gives the desired result in the example: "remotes/origin" and "ml/themes". Signed-off-by: Johannes Sixt <j6t@kdbg.org>
While the Meson build instructions already handle the case where msgfmt wasn't found, we forgot to mark the dependency itself as optional. This causes an error in case the executable could not be found: Project name: gitk Project version: undefined Program sh found: YES (C:\Program Files\Git\bin\sh.EXE) Program wish found: YES (C:\Program Files\Git\mingw64\bin\wish.EXE) Program chmod found: YES (C:\Program Files\Git\usr\bin\chmod.EXE) Program mv found: YES (C:\Program Files\Git\usr\bin\mv.EXE) Program sed found: YES (C:\Program Files\Git\usr\bin\sed.EXE) Program msgfmt found: NO subprojects\gitk\meson.build:28:3: ERROR: Program 'msgfmt' not found or not executable Fix the issue by adding the `required: false` parameter. Signed-off-by: Patrick Steinhardt <ps@pks.im>
…-gitlab/gitk * 'pks-meson-fix-missing-msgfmt' of https://github.com/pks-gitlab/gitk: gitk: fix msgfmt being required Signed-off-by: Johannes Sixt <j6t@kdbg.org>
* 'master' of https://github.com/j6t/gitk: gitk: fix msgfmt being required gitk: fix highlighted remote prefix of branches with directories
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )