Merge branch 'maint-1.6.0' into maint

[git.git] / git-gui / lib / blame.tcl

diff --git a/git-gui/lib/blame.tcl b/git-gui/lib/blame.tcl
index c1cd7f3b92fddb60be9fe261d7b75c5df85b60c1..1f3b08f9efff873631d73e128ee97c1b9dad1822 100644 (file)
--- a/git-gui/lib/blame.tcl
+++ b/git-gui/lib/blame.tcl
@@ -940,9 +940,8 @@ method _showcommit {cur_w lno} {
                        catch {
                                set fd [git_read cat-file commit $cmit]
                                fconfigure $fd -encoding binary -translation lf
-                               if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
-                                       set enc utf-8
-                               }
+                               # By default commits are assumed to be in utf-8
+                               set enc utf-8
                                while {[gets $fd line] > 0} {
                                        if {[string match {encoding *} $line]} {
                                                set enc [string tolower [string range $line 9 end]]