From: Paul Mackerras <paulus@samba.org>
Date: Sun, 27 Apr 2008 23:40:50 +0000 (+1000)
Subject: gitk: Fix handling of tree file list with special chars in names
X-Git-Tag: v1.5.6-rc0~20^2~6^2~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f31fa2c0864ba8b1292119fbb3942cdbaa0fb807;p=git.git

gitk: Fix handling of tree file list with special chars in names

Alex Riesen pointed out that displaying a commit in 'tree' mode fails
if some files have names with special characters such as '{' or '}' in
them, due to the fact that we treat the line returned from git ls-tree
as a Tcl list at one point.

This fixes it by doing what I originally intended but didn't quite
get right.  We split the line from git ls-tree at the first tab and
treat the part before the tab as a list (which is OK since it doesn't
have special characters in it) and the part after the tab as the
filename.

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/gitk b/gitk
index 9a4d9c40c..da685aa63 100755
--- a/gitk
+++ b/gitk
@@ -4992,11 +4992,12 @@ proc gettreeline {gtf id} {
 	if {$diffids eq $nullid} {
 	    set fname $line
 	} else {
-	    if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue
 	    set i [string first "\t" $line]
 	    if {$i < 0} continue
-	    set sha1 [lindex $line 2]
 	    set fname [string range $line [expr {$i+1}] end]
+	    set line [string range $line 0 [expr {$i-1}]]
+	    if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue
+	    set sha1 [lindex $line 2]
 	    if {[string index $fname 0] eq "\""} {
 		set fname [lindex $fname 0]
 	    }