gitk: Display submodule diffs with appropriate encoding

Previously, when submodule commit headings contained non-latin-1
characters, they were displayed incorrectly in gitk, because $line was
not properly decoded, for example:

----------------------------- Documentation/Dokko -----------------------------
Submodule Documentation/Dokko 2ca20c7..0ea204d:
  > �\9f�\80о�\82окол�\8b �\81оп�\80�\8fжени�\8f �\98�\9cС "�\9cо�\81�\82ик-21631"  (�\9b�\982 и Сандал)
  > hardware: док�\83мен�\82а�\86и�\8f на InnoDisk SATA 10000
  > hardware: док�\83мен�\82а�\86и�\8f на IEI PCISA-6770E2 v3.0
  > hardware: док�\83мен�\82а�\86и�\8f на Fastwel NIB941
  > hardware: док�\83мен�\82а�\86и�\8f на IEI IPX-9S
  > hardware: док�\83мен�\82а�\86и�\8f на Hirschmann 5TX-EEC

instead of

----------------------------- Documentation/Dokko -----------------------------
Submodule Documentation/Dokko 2ca20c7..0ea204d:
  > Протоколы сопряжения ИМС "Мостик-21631"  (ЛИ2 и Сандал)
  > hardware: документация на InnoDisk SATA 10000
  > hardware: документация на IEI PCISA-6770E2 v3.0
  > hardware: документация на Fastwel NIB941
  > hardware: документация на IEI IPX-9S
  > hardware: документация на Hirschmann 5TX-EEC

This fixes it.

Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
Signed-off-by: Paul Mackerras <paulus@samba.org>

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]} {