summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Paul Mackerras <paulus@samba.org>2005-08-19 10:22:04 +1000
committerLibravatar Paul Mackerras <paulus@samba.org>2005-08-19 10:22:04 +1000
commit022bc2ac74a300ff9b1ad9a11a5a6da0c981dc5c (patch)
tree56cd894e031062733fdc6cbbdc5a6047e901c327
parentUse the --parents flag to git-rev-list. (diff)
downloadtgif-022bc2ac74a300ff9b1ad9a11a5a6da0c981dc5c.tar.xz
Fix a bug where commits with no children weren't marked as on-screen.
This problem was revealed by running gitk --all on Wolfgang Denk's u-boot repository.
-rwxr-xr-xgitk12
1 files changed, 4 insertions, 8 deletions
diff --git a/gitk b/gitk
index 33abcc4a25..0767695e2a 100755
--- a/gitk
+++ b/gitk
@@ -1019,6 +1019,7 @@ proc drawslants {id needonscreen nohs} {
}
if {$onscreen($id) == 0} {
lappend displist $id
+ set onscreen($id) 1
}
# remove the null entry if present
@@ -1186,15 +1187,10 @@ proc drawslants {id needonscreen nohs} {
set j [lsearch -exact $displist $id]
}
if {$j != $i || $xspc1($lineno) != $xspc1($lj)
- || ($olddlevel <= $i && $i <= $dlevel)
- || ($dlevel <= $i && $i <= $olddlevel)} {
+ || ($olddlevel < $i && $i < $dlevel)
+ || ($dlevel < $i && $i < $olddlevel)} {
set xj [xcoord $j $dlevel $lj]
- set dx [expr {abs($xi - $xj)}]
- set yb $y2
- if {0 && $dx < $linespc} {
- set yb [expr {$y1 + $dx}]
- }
- lappend mainline($id) $xi $y1 $xj $yb
+ lappend mainline($id) $xi $y1 $xj $y2
}
}
}