Skip to content

Commit fa211ac

Browse files
committed
Merge branch 'git-gui--askpass-utf-8'
This fixes the problem where Git was not receiving non-ASCII characters correctly in `git-gui--askpass`'s answer. This used to be #2542, but due to this maintainer's mistake, that PR was closed instead of updated ;-) Signed-off-by: Johannes Schindelin <[email protected]>
2 parents e0fbc27 + a7be4f4 commit fa211ac

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

git-gui/git-gui--askpass

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ proc finish {} {
5656
}
5757
}
5858

59+
# On Windows, force the encoding to UTF-8: it is what `git.exe` expects
60+
if {$::tcl_platform(platform) eq {windows}} {
61+
set ::answer [encoding convertto utf-8 $::answer]
62+
}
63+
5964
puts $::answer
6065
set ::rc 0
6166
}

0 commit comments

Comments
 (0)