diff options
| author |  Łukasz Stelmach <l.stelmach@samsung.com> | 2017-12-05 15:23:26 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-12-05 09:14:45 -0800 |
| commit | 331450f18a7fd298ddd6b85cc5e8ed9dba09f9da (patch) | |
| tree | 86b1af12827cd89d9ba3246ed0f95b5aa63f1256 | |
| parent | Merge remote-tracking branch 'philoakley/dup-gui' (diff) | |
| download | tgif-331450f18a7fd298ddd6b85cc5e8ed9dba09f9da.tar.xz | |
git-gui: prevent double UTF-8 conversion
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | lib/commit.tcl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/commit.tcl b/lib/commit.tcl index 83620b7cbc..75ea965dac 100644 --- a/lib/commit.tcl +++ b/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"] |