From: Paul Mackerras <paulus@samba.org>
Date: Sun, 23 Apr 2006 12:47:07 +0000 (+1000)
Subject: Merge branch 'master' into new
X-Git-Tag: v1.4.0-rc1~21^2~11^2~2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=f3a2469b2583a88b84d12b1e819a177cf7d7670f;hp=a8aaf19c419a30d335f0640ab644112ecda6dd12;p=git.git

Merge branch 'master' into new
---

diff --git a/gitk b/gitk
index 6cefc872..4ee51223 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] {