From: Brian Downing <bdowning@lavos.net>
Date: Thu, 5 Jul 2007 11:33:02 +0000 (-0500)
Subject: [PATCH] gitk: Fix for tree view ending in nested directories
X-Git-Tag: v1.5.3-rc1~1^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=096e96b493bfc30687c87b303b93e75864942786;p=git.git

[PATCH] gitk: Fix for tree view ending in nested directories

Unroll the prefix stack when assigning treeheights when leaving
proc treeview.  Previously, when the ls-tree output ended in
multiple nested directories (for instance in a repository with a
single file "foo/bar/baz"), $treeheight("foo/bar/") was assigned
twice, and $treeheight("foo/") was never assigned.  This led to
an error when expanding the "foo" directory in the gitk treeview.

Signed-off-by: Brian Downing <bdowning@lavos.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/gitk b/gitk
index 45e16e4fd..28a6bac3a 100755
--- a/gitk
+++ b/gitk
@@ -1216,6 +1216,9 @@ proc treeview {w l openlevs} {
 	set treeheight($prefix) $ht
 	incr ht [lindex $htstack end]
 	set htstack [lreplace $htstack end end]
+	set prefixend [lindex $prefendstack end]
+	set prefendstack [lreplace $prefendstack end end]
+	set prefix [string range $prefix 0 $prefixend]
     }
     $w conf -state disabled
 }