diff options
| author |  Kazuhiro Kato <kato-k@ksysllc.co.jp> | 2019-12-07 00:29:09 +0000 |
|---|---|---|
| committer |  Pratyush Yadav <me@yadavpratyush.com> | 2019-12-10 02:43:55 +0530 |
| commit | 39acfa3d224e4a125a3f72ef761ee2cbd24216c2 (patch) | |
| tree | 0cfdafcbcf61d0d587e18502426db5310c3c9b6a | |
| parent | Merge branch 'jg/revert-untracked' (diff) | |
| download | tgif-39acfa3d224e4a125a3f72ef761ee2cbd24216c2.tar.xz | |
git gui: fix branch name encoding error
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.
Signed-off-by: Kazuhiro Kato <kato-k@ksysllc.co.jp>
Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
| -rwxr-xr-x | git-gui.sh | 1 | ||||
| -rw-r--r-- | lib/branch.tcl | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh index 6dcf6551b6..c1be733e3e 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 {} } diff --git a/lib/branch.tcl b/lib/branch.tcl index 777eeb79c1..8b0c485889 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 |