gitk: Do not hard-code "encoding" in attribute lookup functions
Commit 39ee47e (Clean up file encoding code and add enable/disable option, 2008-10-15) rewrote the attribute lookup functions gitattr and cache_gitattr, but in the process hard-coded the attribute name "encoding" instead of using the functions' parameters. This fixes it. This is not a serious regression because currently all callers look only for "encoding". Further note that this fix assumes that future callers will not pass an attribute name that contains regex special characters. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Johannes Sixt committed
Jul 21, 2009 at 10:09 UTC
097e11182213afa4166c0fe58bd8135d71b52fb5
1 file changed
+2
-2
gitk
+2
-2
@@ -10901,7 +10901,7 @@ proc gitattr {path attr default} {
10901
} else {
10902
set r "unspecified"
10903
if {![catch {set line [exec git check-attr $attr -- $path]}]} {
10904
- regexp "(.*): encoding: (.*)" $line m f r
10904
+ regexp "(.*): $attr: (.*)" $line m f r
10905
}
10906
set path_attr_cache($attr,$path) $r
10907
}
@@ -10929,7 +10929,7 @@ proc cache_gitattr {attr pathlist} {
10929
set newlist [lrange $newlist $lim end]
10930
if {![catch {set rlist [eval exec git check-attr $attr -- $head]}]} {
10931
foreach row [split $rlist "\n"] {
10932
- if {[regexp "(.*): encoding: (.*)" $row m path value]} {
10932
+ if {[regexp "(.*): $attr: (.*)" $row m path value]} {
10933
if {[string index $path 0] eq "\""} {
10934
set path [encoding convertfrom [lindex $path 0]]
10935
}