Convert author's name 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.stelm...@samsung.com>
---
git-gui/lib/commit.tcl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 83620b7cb..f820c24bf 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -34,9 +34,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 +42,9 @@ 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 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
