git-gui: Use gitattribute "encoding" for file content display

diff --git a/lib/diff.tcl b/lib/diff.tcl
index e2ed262fb3a794dcb6ed2a4b69f973cd6fe9f9c9..b0ecfbcb5931ee160dbf24dee49940102029e8f5 100644 (file)
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -164,8 +164,11 @@ proc show_other_diff {path w m scroll_pos} {
                                        set sz [string length $content]
                                }
                                file {
+                                       set enc [gitattr $path encoding UTF-8]
                                        set fd [open $path r]
-                                       fconfigure $fd -eofchar {}
+                                       fconfigure $fd \
+                                               -eofchar {} \
+                                               -encoding [tcl_encoding $enc]
                                        set content [read $fd $max_sz]
                                        close $fd
                                        set sz [file size $path]
@@ -276,10 +279,11 @@ proc start_show_diff {scroll_pos {add_opts {}}} {
                return
        }
 
+       set ::current_diff_inheader 1
        fconfigure $fd \
                -blocking 0 \
-               -encoding binary \
-               -translation binary
+               -encoding [tcl_encoding [gitattr $path encoding UTF-8]] \
+               -translation lf
        fileevent $fd readable [list read_diff $fd $scroll_pos]
 }
 
@@ -292,18 +296,21 @@ proc read_diff {fd scroll_pos} {
        while {[gets $fd line] >= 0} {
                # -- Cleanup uninteresting diff header lines.
                #
-               if {   [string match {diff --git *}      $line]
-                       || [string match {diff --cc *}       $line]
-                       || [string match {diff --combined *} $line]
-                       || [string match {--- *}             $line]
-                       || [string match {+++ *}             $line]} {
-                       append current_diff_header $line "\n"
-                       continue
+               if {$::current_diff_inheader} {
+                       if {   [string match {diff --git *}      $line]
+                           || [string match {diff --cc *}       $line]
+                           || [string match {diff --combined *} $line]
+                           || [string match {--- *}             $line]
+                           || [string match {+++ *}             $line]} {
+                               append current_diff_header $line "\n"
+                               continue
+                       }
                }
                if {[string match {index *} $line]} continue
                if {$line eq {deleted file mode 120000}} {
                        set line "deleted symlink"
                }
+               set ::current_diff_inheader 0
 
                # -- Automatically detect if this is a 3 way diff.
                #