git-gui: unicode file name support on windows

diff --git a/git-gui.sh b/git-gui.sh
index f9b323abff381be44d056ee56105270830a43146..1f5acc3c75cfae7a5354467c8060fe3d2f3ea7e5 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -556,6 +556,9 @@ proc git {args} {
 
        _trace_exec [concat $opt $cmdp $args]
        set result [eval exec $opt $cmdp $args]
+       if {[encoding system] != "utf-8"} {
+               set result [encoding convertfrom utf-8 [encoding convertto $result]]
+       }
        if {$::_trace} {
                puts stderr "< $result"
        }
@@ -1111,7 +1114,7 @@ git-version proc _parse_config {arr_name args} {
                                [list git_read config] \
                                $args \
                                [list --null --list]]
-                       fconfigure $fd_rc -translation binary
+                       fconfigure $fd_rc -translation binary -encoding utf-8
                        set buf [read $fd_rc]
                        close $fd_rc
                }
@@ -1691,7 +1694,7 @@ proc read_diff_index {fd after} {
                set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
                set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
                merge_state \
-                       [encoding convertfrom $p] \
+                       [encoding convertfrom utf-8 $p] \
                        [lindex $i 4]? \
                        [list [lindex $i 0] [lindex $i 2]] \
                        [list]
@@ -1724,7 +1727,7 @@ proc read_diff_files {fd after} {
                set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
                set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
                merge_state \
-                       [encoding convertfrom $p] \
+                       [encoding convertfrom utf-8 $p] \
                        ?[lindex $i 4] \
                        [list] \
                        [list [lindex $i 0] [lindex $i 2]]
@@ -1747,7 +1750,7 @@ proc read_ls_others {fd after} {
        set pck [split $buf_rlo "\0"]
        set buf_rlo [lindex $pck end]
        foreach p [lrange $pck 0 end-1] {
-               set p [encoding convertfrom $p]
+               set p [encoding convertfrom utf-8 $p]
                if {[string index $p end] eq {/}} {
                        set p [string range $p 0 end-1]
                }