summaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorBrian Downing <bdowning@lavos.net>2007-07-05 11:33:02 (GMT)
committerPaul Mackerras <paulus@samba.org>2007-07-09 09:28:19 (GMT)
commit096e96b493bfc30687c87b303b93e75864942786 (patch)
treece4f1c02fa7d674dd3db2c4f0373bb81db01d5fd /gitk
parentd36d385efd89d79c9d1f95ab79849ff1478dc425 (diff)
downloadgit-096e96b493bfc30687c87b303b93e75864942786.zip
git-096e96b493bfc30687c87b303b93e75864942786.tar.gz
git-096e96b493bfc30687c87b303b93e75864942786.tar.bz2
[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>
Diffstat (limited to 'gitk')
-rwxr-xr-xgitk3
1 files changed, 3 insertions, 0 deletions
diff --git a/gitk b/gitk
index 45e16e4..28a6bac 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
}