gitk: Display submodule diffs with appropriate encoding

diff --git a/gitk b/gitk
index de911b6e6d0fd8d7ff3217382d698d333b168da3..c1e1119dbc1c1e88956fd524fbc36042a9c18984 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -7689,8 +7689,10 @@ proc getblobdiffline {bdf ids} {
            makediffhdr $fname $ids
            $ctext insert end "\n$line\n" filesep
        } elseif {![string compare -length 3 "  >" $line]} {
+           set line [encoding convertfrom $diffencoding $line]
            $ctext insert end "$line\n" dresult
        } elseif {![string compare -length 3 "  <" $line]} {
+           set line [encoding convertfrom $diffencoding $line]
            $ctext insert end "$line\n" d0
        } elseif {$diffinhdr} {
            if {![string compare -length 12 "rename from " $line]} {