# [PATCH] git-gui--askpass: coerce answers to UTF-8 on Windows 5 messages from 2020-03-11 to 2020-03-15. Participants: Johannes Schindelin via GitGitGadget, Junio C Hamano, Pratyush Yadav. Thread: https://gitlist.dev/t/52979 ## Johannes Schindelin via GitGitGadget, 2020-03-11 19:24 Subject: [PATCH] git-gui--askpass: coerce answers to UTF-8 on Windows Message-ID: URL: https://gitlist.dev/e/pull.578.git.1583954676691.gitgitgadget%40gmail.com ``` From: Luke Bonanomi This addresses the issue where Git for Windows asks the user for a password, no credential helper is available, and then Git fails to pick up non-ASCII characters from the Git GUI helper. This can be verified e.g. via echo host=http://abc.com | git -c credential.helper= credential fill and then pasting some umlauts. The underlying reason is that Git for Windows tries to communicate using the UTF-8 encoding no matter what the actual current code page is. So let's indulge Git for Windows and do use that encoding. This fixes https://github.com/git-for-windows/git/issues/2215 Signed-off-by: Luke Bonanomi Signed-off-by: Johannes Schindelin --- Fix git-gui--askpass on Windows Windows has this odd thing where there is an active code page (somewhat like LC_CTYPE) and there is no real UTF-8 code page. So we need to help git-gui--askpass along a bit to be of use when asking for credentials. Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-578%2Fdscho%2Fgit-gui--askpass-utf-8-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-578/dscho/git-gui--askpass-utf-8-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/578 git-gui--askpass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/git-gui--askpass b/git-gui--askpass index 4277f30c411..b0704e6d91e 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 } base-commit: 63a58457e094c9c9bbf562b872009d32f1f88133 -- gitgitgadget ``` ## Junio C Hamano, 2020-03-11 20:17 Subject: Re: [PATCH] git-gui--askpass: coerce answers to UTF-8 on Windows Message-ID: URL: https://gitlist.dev/e/xmqqa74mhcjb.fsf%40gitster.c.googlers.com In-Reply-To: ``` "Johannes Schindelin via GitGitGadget" writes: > diff --git a/git-gui--askpass b/git-gui--askpass > index 4277f30c411..b0704e6d91e 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}} { The indentation looks funny here. Dedent one level? > + set ::answer [encoding convertto utf-8 $::answer] > + } Looks correct (assuming that $::answer we got is Unicode "string", and I think that is a sane assumpton as it came directly from a textvariable bound to an entry widget). > puts $::answer > set ::rc 0 > } > > base-commit: 63a58457e094c9c9bbf562b872009d32f1f88133 ``` ## Johannes Schindelin via GitGitGadget, 2020-03-12 21:31 Subject: [PATCH v2] git-gui--askpass: coerce answers to UTF-8 on Windows Message-ID: URL: https://gitlist.dev/e/pull.578.v2.git.1584048710895.gitgitgadget%40gmail.com In-Reply-To: ``` From: Luke Bonanomi This addresses the issue where Git for Windows asks the user for a password, no credential helper is available, and then Git fails to pick up non-ASCII characters from the Git GUI helper. This can be verified e.g. via echo host=http://abc.com | git -c credential.helper= credential fill and then pasting some umlauts. The underlying reason is that Git for Windows tries to communicate using the UTF-8 encoding no matter what the actual current code page is. So let's indulge Git for Windows and do use that encoding. This fixes https://github.com/git-for-windows/git/issues/2215 Signed-off-by: Luke Bonanomi Helped-by: Junio C Hamano Signed-off-by: Johannes Schindelin --- Fix git-gui--askpass on Windows Windows has this odd thing where there is an active code page (somewhat like LC_CTYPE) and there is no real UTF-8 code page. So we need to help git-gui--askpass along a bit to be of use when asking for credentials. Changes since v1: * Fixed indentation Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-578%2Fdscho%2Fgit-gui--askpass-utf-8-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-578/dscho/git-gui--askpass-utf-8-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/578 Range-diff vs v1: 1: 3beec773772 ! 1: 7891941486d git-gui--askpass: coerce answers to UTF-8 on Windows @@ -20,6 +20,7 @@ This fixes https://github.com/git-for-windows/git/issues/2215 Signed-off-by: Luke Bonanomi + Helped-by: Junio C Hamano Signed-off-by: Johannes Schindelin diff --git a/git-gui--askpass b/git-gui--askpass @@ -30,7 +31,7 @@ } + # On Windows, force the encoding to UTF-8: it is what `git.exe` expects -+ if {$::tcl_platform(platform) eq {windows}} { ++ if {$::tcl_platform(platform) eq {windows}} { + set ::answer [encoding convertto utf-8 $::answer] + } + git-gui--askpass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/git-gui--askpass b/git-gui--askpass index 4277f30c411..1c99ee8ca20 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 } base-commit: 63a58457e094c9c9bbf562b872009d32f1f88133 -- gitgitgadget ``` ## Junio C Hamano, 2020-03-13 00:11 Subject: Re: [PATCH v2] git-gui--askpass: coerce answers to UTF-8 on Windows Message-ID: URL: https://gitlist.dev/e/xmqq7dzpdsfy.fsf%40gitster.c.googlers.com In-Reply-To: ``` "Johannes Schindelin via GitGitGadget" writes: > From: Luke Bonanomi > > This addresses the issue where Git for Windows asks the user for a > password, no credential helper is available, and then Git fails to pick > up non-ASCII characters from the Git GUI helper. > > This can be verified e.g. via > > echo host=http://abc.com | > git -c credential.helper= credential fill > > and then pasting some umlauts. > > The underlying reason is that Git for Windows tries to communicate using > the UTF-8 encoding no matter what the actual current code page is. So > let's indulge Git for Windows and do use that encoding. > > This fixes https://github.com/git-for-windows/git/issues/2215 > > Signed-off-by: Luke Bonanomi > Helped-by: Junio C Hamano > Signed-off-by: Johannes Schindelin > --- Heh, that is over-crediting me. I didn't do anything other than just scan the code once. > Fix git-gui--askpass on Windows > > Windows has this odd thing where there is an active code page (somewhat > like LC_CTYPE) and there is no real UTF-8 code page. So we need to help > git-gui--askpass along a bit to be of use when asking for credentials. > > Changes since v1: > > * Fixed indentation > > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-578%2Fdscho%2Fgit-gui--askpass-utf-8-v2 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-578/dscho/git-gui--askpass-utf-8-v2 > Pull-Request: https://github.com/gitgitgadget/git/pull/578 > > Range-diff vs v1: > > 1: 3beec773772 ! 1: 7891941486d git-gui--askpass: coerce answers to UTF-8 on Windows > @@ -20,6 +20,7 @@ > This fixes https://github.com/git-for-windows/git/issues/2215 > > Signed-off-by: Luke Bonanomi > + Helped-by: Junio C Hamano > Signed-off-by: Johannes Schindelin > > diff --git a/git-gui--askpass b/git-gui--askpass > @@ -30,7 +31,7 @@ > } > > + # On Windows, force the encoding to UTF-8: it is what `git.exe` expects > -+ if {$::tcl_platform(platform) eq {windows}} { > ++ if {$::tcl_platform(platform) eq {windows}} { > + set ::answer [encoding convertto utf-8 $::answer] > + } > + > > > git-gui--askpass | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/git-gui--askpass b/git-gui--askpass > index 4277f30c411..1c99ee8ca20 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 > } > > base-commit: 63a58457e094c9c9bbf562b872009d32f1f88133 ``` ## Pratyush Yadav, 2020-03-14 17:26 Subject: Re: [PATCH v2] git-gui--askpass: coerce answers to UTF-8 on Windows Message-ID: <20200314172600.a6nrm7h3pdzshdv2@yadavpratyush.com> URL: https://gitlist.dev/e/20200314172600.a6nrm7h3pdzshdv2%40yadavpratyush.com In-Reply-To: ``` On 12/03/20 09:31PM, Johannes Schindelin via GitGitGadget wrote: > From: Luke Bonanomi > > This addresses the issue where Git for Windows asks the user for a > password, no credential helper is available, and then Git fails to pick > up non-ASCII characters from the Git GUI helper. > > This can be verified e.g. via > > echo host=http://abc.com | > git -c credential.helper= credential fill > > and then pasting some umlauts. > > The underlying reason is that Git for Windows tries to communicate using > the UTF-8 encoding no matter what the actual current code page is. So > let's indulge Git for Windows and do use that encoding. > > This fixes https://github.com/git-for-windows/git/issues/2215 > > Signed-off-by: Luke Bonanomi > Helped-by: Junio C Hamano > Signed-off-by: Johannes Schindelin Merged. Thanks all. -- Regards, Pratyush Yadav ```