summaryrefslogtreecommitdiff
path: root/git-gui/git-gui--askpass
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-03-19 23:06:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-19 23:06:51 (GMT)
commit98cedd0233ee88e69711f79d1126b6bd772ff5bd (patch)
tree54a5e5c17d069d5d5ac3283d38a892c3e010d0a4 /git-gui/git-gui--askpass
parent7fcb9659703b9dd611acb7cb85752be8ba4dcf31 (diff)
parenta5728022e07c53e5ac91db0960870518e243b7c1 (diff)
downloadgit-98cedd0233ee88e69711f79d1126b6bd772ff5bd.zip
git-98cedd0233ee88e69711f79d1126b6bd772ff5bd.tar.gz
git-98cedd0233ee88e69711f79d1126b6bd772ff5bd.tar.bz2
Merge https://github.com/prati0100/git-gui
* 'master' of https://github.com/prati0100/git-gui: git-gui: create a new namespace for chord script evaluation git-gui: reduce Tcl version requirement from 8.6 to 8.5 git-gui--askpass: coerce answers to UTF-8 on Windows git-gui: fix error popup when doing blame -> "Show History Context" git-gui: add missing close bracket git-gui: update German translation git-gui: extend translation glossary template with more terms git-gui: update pot template and German translation to current source code
Diffstat (limited to 'git-gui/git-gui--askpass')
-rwxr-xr-xgit-gui/git-gui--askpass5
1 files changed, 5 insertions, 0 deletions
diff --git a/git-gui/git-gui--askpass b/git-gui/git-gui--askpass
index 4277f30..1c99ee8 100755
--- a/git-gui/git-gui--askpass
+++ b/git-gui/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
}