From: "Shawn O. Pearce" <spearce@spearce.org>
To: Pedro Melo <melo@simplicidade.org>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Jakub Narebski <jnareb@gmail.com>,
Finn Arne Gangstad <finnag@pvv.org>,
Michele Ballabio <barra_cuda@katamail.com>
Subject: Re: [RFC/PATCH] git-gui: Use gitattribute "encoding" for file content display
Date: Wed, 23 Jan 2008 22:39:01 -0500 [thread overview]
Message-ID: <20080124033901.GN24004@spearce.org> (raw)
In-Reply-To: <4FF40048-FCF4-4BAD-AD08-6ADAD30E7B6A@simplicidade.org>
Pedro Melo <melo@simplicidade.org> wrote:
> On Jan 23, 2008, at 5:47 AM, Shawn O. Pearce wrote:
>
> >I've got the following change in my "pu" right now and am considering
> >adding it to git-gui 0.9.2, which would be in git 1.5.4.
>
> Spoke too soon.
>
> I can see the UTF-8 chars in the diffs, but if I use Stage Hunk for
> Commit in a hunk with accentuated utf-8 chars, git-gui will throw an
> error like "patch does not apply".
Yea, I know why. It actually kept me awake for a little bit last
night after I sent the patch out for comment, but wasn't big enough
to get me out of bed to fix it.
The issue is git-gui doesn't convert back from character data to
binary correctly, so the patch won't apply, as the context will
not match. Its simple enough to fix, we just have to remember
the encoding we used to go from git-diff --> Tcl and use that
same encoding in the other direction (Tcl --> git-apply).
--
Shawn.
prev parent reply other threads:[~2008-01-24 3:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-23 5:47 [RFC/PATCH] git-gui: Use gitattribute "encoding" for file content display Shawn O. Pearce
2008-01-23 5:55 ` Junio C Hamano
2008-01-23 8:41 ` Steffen Prohaska
2008-01-23 10:28 ` Jakub Narebski
2008-01-24 3:36 ` Shawn O. Pearce
2008-01-23 7:02 ` Pedro Melo
[not found] ` <4FF40048-FCF4-4BAD-AD08-6ADAD30E7B6A@simplicidade.org>
2008-01-24 3:39 ` Shawn O. Pearce [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080124033901.GN24004@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=barra_cuda@katamail.com \
--cc=finnag@pvv.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=melo@simplicidade.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.
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 NNTP newsgroup(s).