Skip to content

Commit a4a2f64

Browse files
committed
Merge branch 'js/askpass-coerce-utf8'
Askpass can now send non-ASCII to Git on Windows. * js/askpass-coerce-utf8: git-gui--askpass: coerce answers to UTF-8 on Windows
2 parents d769dcc + 850cf9a commit a4a2f64

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

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)