From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Pratyush Yadav <me@yadavpratyush.com>,
Luke Bonanomi <lbonanomi@gmail.com>
Subject: Re: [PATCH v2] git-gui--askpass: coerce answers to UTF-8 on Windows
Date: Thu, 12 Mar 2020 17:11:45 -0700 [thread overview]
Message-ID: <xmqq7dzpdsfy.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <pull.578.v2.git.1584048710895.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Thu, 12 Mar 2020 21:31:50 +0000")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> From: Luke Bonanomi <lbonanomi@gmail.com>
>
> 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 <lbonanomi@gmail.com>
> Helped-by: Junio C Hamano <gitster@pobox.com>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
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 <lbonanomi@gmail.com>
> + Helped-by: Junio C Hamano <gitster@pobox.com>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> 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
next prev parent reply other threads:[~2020-03-13 0:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-11 19:24 [PATCH] git-gui--askpass: coerce answers to UTF-8 on Windows Johannes Schindelin via GitGitGadget
2020-03-11 20:17 ` Junio C Hamano
2020-03-12 21:31 ` [PATCH v2] " Johannes Schindelin via GitGitGadget
2020-03-13 0:11 ` Junio C Hamano [this message]
2020-03-14 17:26 ` Pratyush Yadav
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7dzpdsfy.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=lbonanomi@gmail.com \
--cc=me@yadavpratyush.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).