From: Bernhard Übelacker <[email protected]>

In "New Commit" author name is set correctly.
But when doing "Amend Last Commit" the encoding gets wrong.

This patch adds in load_last_commit a similar assignment converting
to tcl encoding for commit_author as already exists for msg.
---
 lib/commit.tcl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/commit.tcl b/lib/commit.tcl
index 83620b7..f5357f2 100644
--- a/lib/commit.tcl
+++ b/lib/commit.tcl
@@ -46,6 +46,9 @@ You are currently in the middle of a merge that has not been 
fully completed.  Y
                                set msg [encoding convertfrom $enc $msg]
                        }
                        set msg [string trim $msg]
+                       if {$enc ne {}} {
+                               set commit_author [encoding convertfrom $enc 
$commit_author]
+                       }
                } err]} {
                error_popup [strcat [mc "Error loading commit data for amend:"] 
"\n\n$err"]
                return
-- 
2.11.0

Reply via email to