summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-04-23 12:47:07 (GMT)
committerPaul Mackerras <paulus@samba.org>2006-04-23 12:47:07 (GMT)
commitf3a2469b2583a88b84d12b1e819a177cf7d7670f (patch)
tree8ca578c06fdd2357b0a7038249674c5f8c4080c5
parenta8aaf19c419a30d335f0640ab644112ecda6dd12 (diff)
parent61e56c8823afd2c5a753a4969330ead0ba850c66 (diff)
downloadgit-f3a2469b2583a88b84d12b1e819a177cf7d7670f.zip
git-f3a2469b2583a88b84d12b1e819a177cf7d7670f.tar.gz
git-f3a2469b2583a88b84d12b1e819a177cf7d7670f.tar.bz2
Merge branch 'master' into new
-rwxr-xr-xgitk5
1 files changed, 3 insertions, 2 deletions
diff --git a/gitk b/gitk
index 6cefc87..4ee5122 100755
--- a/gitk
+++ b/gitk
@@ -1361,11 +1361,12 @@ proc layoutrows {row endrow last} {
proc addextraid {id row} {
global displayorder commitrow commitinfo
- global commitidx
+ global commitidx commitlisted
global parentlist childlist children
incr commitidx
lappend displayorder $id
+ lappend commitlisted 0
lappend parentlist {}
set commitrow($id) $row
readcommit $id
@@ -1770,7 +1771,7 @@ proc drawcmittext {id row col rmx} {
proc drawcmitrow {row} {
global displayorder rowidlist
global idrangedrawn iddrawn
- global commitinfo commitlisted parentlist numcommits
+ global commitinfo parentlist numcommits
if {$row >= $numcommits} return
foreach id [lindex $rowidlist $row] {