加藤一博 <kato-k@xxxxxxxxxxxxx> writes:
> After "git checkout -b '漢字'" to create a branch with UTF-8
> character in it, "git gui" shows the branch name incorrectly,
> as it forgets to turn the bytes
> read from the "git for-each-ref" and
> read from "HEAD" file
> into Unicode characters.
Thanks.
Note to the git-gui mentainer. The above may want to be
line-wrapped a bit.
> Signed-off-by: Kazuhiro Kato <kato-k@xxxxxxxxxxxxx>
> ---
> git-gui.sh | 1 +
> lib/branch.tcl | 2 ++
> 2 files changed, 3 insertions(+)
>
> diff --git a/git-gui.sh b/git-gui.sh
> index 0d21f56..8f4a9ae 100755
> --- a/git-gui.sh
> +++ b/git-gui.sh
> @@ -684,6 +684,7 @@ proc load_current_branch {} {
> global current_branch is_detached
>
> set fd [open [gitdir HEAD] r]
> + fconfigure $fd -translation binary -encoding utf-8
> if {[gets $fd ref] < 1} {
> set ref {}
> }
A comment totally outside the scope of this fix to anybody
interested in further working on this code.
This piece of code is way too intimate with the implementation
details of HEAD and yet not intimate enough to know that HEAD can be
a symlink (in other words, it is a poor imitation of the real logic
implemented in git core). A kosher way to implement this would be
to call
git symbolic-ref --quiet --short HEAD
which would succeed and give the branch name to its standard output,
or would fail when the head is detached. Set "current_branch" and
"is_detached" according to the outcome.
And yes, Kato-san's fconfigure fix in this patch will still be
relevant even after such a fix to the implementation of this proc.
> diff --git a/lib/branch.tcl b/lib/branch.tcl
> index 777eeb7..8b0c485 100644
> --- a/lib/branch.tcl
> +++ b/lib/branch.tcl
> @@ -8,6 +8,7 @@ proc load_all_heads {} {
> set rh_len [expr {[string length $rh] + 1}]
> set all_heads [list]
> set fd [git_read for-each-ref --format=%(refname) $rh]
> + fconfigure $fd -translation binary -encoding utf-8
> while {[gets $fd line] > 0} {
> if {!$some_heads_tracking || ![is_tracking_branch $line]} {
> lappend all_heads [string range $line $rh_len end]
> @@ -24,6 +25,7 @@ proc load_all_tags {} {
> --sort=-taggerdate \
> --format=%(refname) \
> refs/tags]
> + fconfigure $fd -translation binary -encoding utf-8
> while {[gets $fd line] > 0} {
> if {![regsub ^refs/tags/ $line {} name]} continue
> lappend all_tags $name
