From: "Łukasz Stelmach" <l.stelmach@samsung.com>
To: git@vger.kernel.org
Cc: "Łukasz Stelmach" <l.stelmach@samsung.com>,
"Stefan Beller" <sbeller@google.com>,
"Pat Thoyts" <patthoyts@users.sourceforge.net>
Subject: [PATCH] git-gui: Prevent double UTF-8 conversion
Date: Tue, 28 Nov 2017 11:21:26 +0100 [thread overview]
Message-ID: <20171128102126.20864-1-l.stelmach@samsung.com> (raw)
In-Reply-To: CGME20171128102138eucas1p116ae54d723bb100202fae2c1aaf5a9d8@eucas1p1.samsung.com
Set encoding to utf-8 for file descriptors used to receive data from
git commands.
With encoding on the file descriptor set to "binary" Tcl (8.6 in my case)
does double conversion which breaks e.g. author name in amended commits.
For example "\305\201ukasz" (as written by git cat-file) becomes
"\303\205\302\201ukasz".
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
git-gui/lib/commit.tcl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
So, this is the second attempt to draw some attention to this patch,
since the first one has somewhat failed.
https://marc.info/?l=git&m=150331641702091&w=2
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 83620b7cb..bcb6499a0 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -26,7 +26,7 @@ You are currently in the middle of a merge that has not been fully completed. Y
set parents [list]
if {[catch {
set fd [git_read cat-file commit $curHEAD]
- fconfigure $fd -encoding binary -translation lf
+ fconfigure $fd -encoding utf-8 -translation lf
# By default commits are assumed to be in utf-8
set enc utf-8
while {[gets $fd line] > 0} {
--
2.11.0
next parent reply other threads:[~2017-11-28 10:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20171128102138eucas1p116ae54d723bb100202fae2c1aaf5a9d8@eucas1p1.samsung.com>
2017-11-28 10:21 ` Łukasz Stelmach [this message]
2017-11-28 14:35 ` [PATCH] git-gui: Prevent double UTF-8 conversion Johannes Schindelin
2017-12-02 10:33 ` Łukasz Stelmach
2017-12-02 12:20 ` [PATCH v2] " Łukasz Stelmach
2017-12-04 14:31 ` Johannes Schindelin
[not found] ` <CGME20171205142341eucas1p2b30072c799c8787f1b66db2fd4bac1a2@eucas1p2.samsung.com>
2017-12-05 14:23 ` [PATCH v3] " Łukasz Stelmach
2017-12-07 0:06 ` Johannes Schindelin
[not found] ` <CGME20171214093300eucas1p28ed9bf0261a43a12978b6a3bfe908321@eucas1p2.samsung.com>
2017-12-14 9:32 ` [PATCH v4] " Łukasz Stelmach
2017-12-14 9:42 ` Eric Sunshine
[not found] ` <CGME20171214104348eucas1p2921cdc8df00c90055927ec99eba3040a@eucas1p2.samsung.com>
2017-12-14 10:43 ` Łukasz Stelmach
2017-12-14 18:18 ` Eric Sunshine
[not found] <CGME20170821115329eucas1p1c550891b502863669ca351de028f2b80@eucas1p1.samsung.com>
2017-08-21 11:53 ` [PATCH] " Łukasz Stelmach
2017-08-21 18:52 ` Stefan Beller
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=20171128102126.20864-1-l.stelmach@samsung.com \
--to=l.stelmach@samsung.com \
--cc=git@vger.kernel.org \
--cc=patthoyts@users.sourceforge.net \
--cc=sbeller@google.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).