gitk: fix branch name encoding error on gitk

Commit Message

加藤一博 Dec. 7, 2019, 12:32 a.m. UTC

From: Kazuhiro Kato <[e-mail]>

After "git checkout -b '漢字'" to create a branch with UTF-8
character in it, "gitk" shows the branch name incorrectly, as it
forgets to turn the bytes read from the "git show-ref" command
into Unicode characters.

Signed-off-by: Kazuhiro Kato <[e-mail]>
---
 gitk | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Junio C Hamano Dec. 9, 2019, 7:19 p.m. UTC | #1

[jc: pinging the gitk maintainer]

加藤一博 <[e-mail]> writes:

> From: Kazuhiro Kato <[e-mail]>

Kato-san, do you prefer this address, over ksysllc address?  Either
way, we prefer to see it match the address used on the signed-off-by
line below.

> After "git checkout -b '漢字'" to create a branch with UTF-8
> character in it, "gitk" shows the branch name incorrectly, as it
> forgets to turn the bytes read from the "git show-ref" command
> into Unicode characters.
>
> Signed-off-by: Kazuhiro Kato <[e-mail]>
> ---
>  gitk | 4 ++++
>  1 file changed, 4 insertions(+)

Thanks.

> diff --git a/gitk b/gitk
> index abe4805..3f61a5b 100755
> --- a/gitk
> +++ b/gitk
> @@ -1780,11 +1780,15 @@ proc readrefs {} {
>      global otherrefids idotherrefs mainhead mainheadid
>      global selecthead selectheadid
>      global hideremotes
> +    global tclencoding
>  
>      foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
>  	unset -nocomplain $v
>      }
>      set refd [open [list | git show-ref -d] r]
> +    if {$tclencoding != {}} {
> +	fconfigure $refd -encoding $tclencoding
> +    }
>      while {[gets $refd line] >= 0} {
>  	if {[string index $line 40] ne " "} continue
>  	set id [string range $line 0 39]

Paul Mackerras Dec. 15, 2019, 4:29 a.m. UTC | #2

On Sat, Dec 07, 2019 at 12:32:25AM +0000, 加藤一博 wrote:
> From: Kazuhiro Kato <[e-mail]>
> 
> After "git checkout -b '漢字'" to create a branch with UTF-8
> character in it, "gitk" shows the branch name incorrectly, as it
> forgets to turn the bytes read from the "git show-ref" command
> into Unicode characters.
> 
> Signed-off-by: Kazuhiro Kato <[e-mail]>

Thanks, applied.

Paul.

Patch

diff --git a/gitk b/gitk
index abe4805..3f61a5b 100755
--- a/gitk
+++ b/gitk
@@ -1780,11 +1780,15 @@  proc readrefs {} {
     global otherrefids idotherrefs mainhead mainheadid
     global selecthead selectheadid
     global hideremotes
+    global tclencoding
 
     foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
 	unset -nocomplain $v
     }
     set refd [open [list | git show-ref -d] r]
+    if {$tclencoding != {}} {
+	fconfigure $refd -encoding $tclencoding
+    }
     while {[gets $refd line] >= 0} {
 	if {[string index $line 40] ne " "} continue
 	set id [string range $line 0 39]