summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPratyush Yadav <me@yadavpratyush.com>2020-03-14 17:22:43 (GMT)
committerPratyush Yadav <me@yadavpratyush.com>2020-03-14 17:22:43 (GMT)
commita4a2f646421e772acc78b8118c821645d92ba57d (patch)
treed272db6a57243cb809379028c3829c1abd743eb3
parentd769dcc5cdd92e046eadee3cf878afc7ca806b14 (diff)
parent850cf9ae961ce59c980b0c59abd3dd676fb7b7ec (diff)
downloadgit-a4a2f646421e772acc78b8118c821645d92ba57d.zip
git-a4a2f646421e772acc78b8118c821645d92ba57d.tar.gz
git-a4a2f646421e772acc78b8118c821645d92ba57d.tar.bz2
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
-rwxr-xr-xgit-gui--askpass5
1 files changed, 5 insertions, 0 deletions
diff --git a/git-gui--askpass b/git-gui--askpass
index 4277f30..1c99ee8 100755
--- a/git-gui--askpass
+++ b/git-gui--askpass
@@ -56,6 +56,11 @@ proc finish {} {
}
}
+ # On Windows, force the encoding to UTF-8: it is what `git.exe` expects
+ if {$::tcl_platform(platform) eq {windows}} {
+ set ::answer [encoding convertto utf-8 $::answer]
+ }
+
puts $::answer
set ::rc 0
}