summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-17 01:59:30 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-17 01:59:30 (GMT)
commit1a17ee22a2fbd85a893ab36fd53168d03554c2dd (patch)
tree7cecffa51810b2459b9562ac8fd55132bdd3693a
parent5bc4ce589646faf72c7a77a5d32d9496ccc8d456 (diff)
parente7da347520486ce33bb77d241b574787c0ec18e8 (diff)
downloadgit-1a17ee22a2fbd85a893ab36fd53168d03554c2dd.zip
git-1a17ee22a2fbd85a893ab36fd53168d03554c2dd.tar.gz
git-1a17ee22a2fbd85a893ab36fd53168d03554c2dd.tar.bz2
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix bug caused by missing commitlisted elements
-rwxr-xr-xgitk5
1 files changed, 3 insertions, 2 deletions
diff --git a/gitk b/gitk
index f88c06e..87e7162 100755
--- a/gitk
+++ b/gitk
@@ -1116,11 +1116,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
@@ -1500,7 +1501,7 @@ proc drawcmittext {id row col rmx} {
proc drawcmitrow {row} {
global displayorder rowidlist
global idrowranges idrangedrawn iddrawn
- global commitinfo commitlisted parentlist numcommits
+ global commitinfo parentlist numcommits
if {$row >= $numcommits} return
foreach id [lindex $rowidlist $row] {