git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Paul Mackerras <paulus@ozlabs.org>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>, 加藤一博 <kato-k@ksysllc.co.jp>
Subject: Re: [PATCH] gitk branch name encoding utf-8 probrem
Date: Thu, 05 Dec 2019 12:28:06 -0800	[thread overview]
Message-ID: <xmqqimmuzfe1.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <TY2PR01MB2427631CC07116A662AF3D38CA5C0@TY2PR01MB2427.jpnprd01.prod.outlook.com> ("加藤一博"'s message of "Thu, 5 Dec 2019 15:02:15 +0000")

加藤一博 <kato-k@ksysllc.co.jp> writes:

> fix branch name encoding error on gitk.
>
> git checkout -b '漢字'
> gitk show branch name broken like this '貍「蟄'
> fix this problem.

Paul (the gitk maintainer), the patch text itself does look
reasonable.

    After "git checkout -b '漢字'" to create a branch with UTF-8
    character in it, "gitk" shows the branch name incorrectly, as it
    forgets to turns the bytes read from the "git show-ref" command
    into Unicode characters.

is how I would phrase the log message.

Thanks.

>
> Signed-off-by: Kazuhiro Kato <kato-k@ksysllc.co.jp>
> ---
>  gitk | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/gitk b/gitk
> index abe4805..3f61a5b 100755
> --- a/gitk
> +++ b/gitk
> @@ -1780,11 +1780,15 @@ proc readrefs {} {
>      global otherrefids idotherrefs mainhead mainheadid
>      global selecthead selectheadid
>      global hideremotes
> +    global tclencoding
>  
>      foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
>  	unset -nocomplain $v
>      }
>      set refd [open [list | git show-ref -d] r]
> +    if {$tclencoding != {}} {
> +	fconfigure $refd -encoding $tclencoding
> +    }
>      while {[gets $refd line] >= 0} {
>  	if {[string index $line 40] ne " "} continue
>  	set id [string range $line 0 39]
> --
>
> See this pull request
> https://github.com/kkato233/gitk/pull/4
>
> -----Original Message-----
> From: Jonathan Nieder <jrnieder@gmail.com> 
> Sent: Thursday, December 5, 2019 7:29 AM
> To: 加藤一博 <kato-k@ksysllc.co.jp>
> Cc: git@vger.kernel.org; Paul Mackerras <paulus@ozlabs.org>
> Subject: Re: [PATCH] gitk branch name encoding utf-8 probrem
>
> (cc-ing Paul, gitk expert)
> Hi!
>
> 加藤一博 wrote:
>
>> Here is a patch to gitk branch name utf-8 probrem.
>
> Thanks for reporting it.  Can you provide a short summary here of
> the problem that we can use for a self-contained description in the
> commit log?  See
> https://www.kernel.org/pub/software/scm/git/docs/SubmittingPatches.html#describe-changes
> for more on this subject.
>
> May we also have your sign-off?  See
> https://www.kernel.org/pub/software/scm/git/docs/SubmittingPatches.html#sign-off
> for what this means.
>
> Thanks and hope that helps,
> Jonathan
>
>> See issue
>> https://github.com/kkato233/gitk/issues/1
>> and fix it 
>> https://github.com/kkato233/gitk/pull/2
>> 
>> 
>> ---
>> 
>> diff --git a/gitk b/gitk
>> index abe4805..3f61a5b 100755
>> --- a/gitk
>> +++ b/gitk
>> @@ -1780,11 +1780,15 @@ proc readrefs {} {
>>      global otherrefids idotherrefs mainhead mainheadid
>>      global selecthead selectheadid
>>      global hideremotes
>> +    global tclencoding
>> 
>>      foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
>>         unset -nocomplain $v
>>      }
>>      set refd [open [list | git show-ref -d] r]
>> +    if {$tclencoding != {}} {
>> +       fconfigure $refd -encoding $tclencoding
>> +    }
>>      while {[gets $refd line] >= 0} {
>>         if {[string index $line 40] ne " "} continue
>>         set id [string range $line 0 39]

  reply	other threads:[~2019-12-05 20:28 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-04 18:36 [PATCH] gitk branch name encoding utf-8 probrem 加藤一博
2019-12-04 22:29 ` Jonathan Nieder
2019-12-05 15:02   ` 加藤一博
2019-12-05 20:28     ` Junio C Hamano [this message]
2019-12-05 20:40       ` Pratyush Yadav
2019-12-05 20:50       ` 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=xmqqimmuzfe1.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=kato-k@ksysllc.co.jp \
    --cc=paulus@ozlabs.org \
    /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).