From: "Łukasz Stelmach" <l.stelmach@samsung.com>
To: git@vger.kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "Łukasz Stelmach" <l.stelmach@samsung.com>,
"Pat Thoyts" <patthoyts@users.sourceforge.net>,
"Łukasz Stelmch" <stlman@poczta.fm>
Subject: [PATCH v3] git-gui: Prevent double UTF-8 conversion
Date: Tue, 05 Dec 2017 15:23:26 +0100 [thread overview]
Message-ID: <20171205142326.6140-1-l.stelmach@samsung.com> (raw)
In-Reply-To: <20171202122046.6033-1-l.stelmach@samsung.com>
Convert author's name and e-mail address from the UTF-8 (or any other)
encoding in load_last_commit function the same way commit message is
converted.
Amending commits in git-gui without such conversion breaks UTF-8
strings. For example, "\305\201ukasz" (as written by git cat-file) becomes
"\303\205\302\201ukasz" in an amended commit.
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
git-gui/lib/commit.tcl | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 83620b7cb..75ea965da 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -25,6 +25,8 @@ You are currently in the middle of a merge that has not been fully completed. Y
set msg {}
set parents [list]
if {[catch {
+ set name ""
+ set email ""
set fd [git_read cat-file commit $curHEAD]
fconfigure $fd -encoding binary -translation lf
# By default commits are assumed to be in utf-8
@@ -34,9 +36,7 @@ You are currently in the middle of a merge that has not been fully completed. Y
lappend parents [string range $line 7 end]
} elseif {[string match {encoding *} $line]} {
set enc [string tolower [string range $line 9 end]]
- } elseif {[regexp "author (.*)\\s<(.*)>\\s(\\d.*$)" $line all name email time]} {
- set commit_author [list name $name email $email date $time]
- }
+ } elseif {[regexp "author (.*)\\s<(.*)>\\s(\\d.*$)" $line all name email time]} { }
}
set msg [read $fd]
close $fd
@@ -44,7 +44,13 @@ You are currently in the middle of a merge that has not been fully completed. Y
set enc [tcl_encoding $enc]
if {$enc ne {}} {
set msg [encoding convertfrom $enc $msg]
+ set name [encoding convertfrom $enc $name]
+ set email [encoding convertfrom $enc $email]
}
+ if {$name ne {} && $email ne {}} {
+ set commit_author [list name $name email $email date $time]
+ }
+
set msg [string trim $msg]
} err]} {
error_popup [strcat [mc "Error loading commit data for amend:"] "\n\n$err"]
--
2.11.0
next prev parent reply other threads:[~2017-12-05 14:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20171128102138eucas1p116ae54d723bb100202fae2c1aaf5a9d8@eucas1p1.samsung.com>
2017-11-28 10:21 ` [PATCH] git-gui: Prevent double UTF-8 conversion Łukasz Stelmach
2017-11-28 14:35 ` 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 ` Łukasz Stelmach [this message]
2017-12-07 0:06 ` [PATCH v3] " 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
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=20171205142326.6140-1-l.stelmach@samsung.com \
--to=l.stelmach@samsung.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=patthoyts@users.sourceforge.net \
--cc=stlman@poczta.fm \
/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).