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

diff --git a/git-gui.sh b/git-gui.sh
index cb0fcac99fa25348bb2ea195c08e5e339ea8e050..4a762355d64f41e89af3aa1ceab713ba16eae380 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -521,6 +521,19 @@ proc kill_file_process {fd} {
        }
 }
 
+proc gitattr {path attr default} {
+       if {[catch {set r [git check-attr $attr -- $path]}]} {
+               set r unspecified
+       } else {
+               set r [join [lrange [split $r :] 2 end] :]
+               regsub {^ } $r {} r
+       }
+       if {$r eq {unspecified}} {
+               return $default
+       }
+       return $r
+}
+
 proc sq {value} {
        regsub -all ' $value "'\\''" value
        return "'$value'"