aboutsummaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-07-04 21:57:04 +1000
committerPaul Mackerras <paulus@samba.org>2007-07-04 21:57:04 +1000
commit69c0b5d2408cfe207f2976fc99cbe71208ba83ad (patch)
tree7aefca5ab89e7eb8687ad53f43c9457f7ea13585 /gitk
parent4fb0fa197e14c82d64adb292320f9444d7ac46c5 (diff)
downloadgit-69c0b5d2408cfe207f2976fc99cbe71208ba83ad.tar.gz
git-69c0b5d2408cfe207f2976fc99cbe71208ba83ad.tar.xz
gitk: Fix bug in the anc_or_desc routine
I missed the case where both nodes have no children and therefore have no incoming arcs. This fixes it. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'gitk')
-rwxr-xr-xgitk3
1 files changed, 2 insertions, 1 deletions
diff --git a/gitk b/gitk
index d50914549..767b0ed8b 100755
--- a/gitk
+++ b/gitk
@@ -6261,7 +6261,8 @@ proc anc_or_desc {a b} {
# Both are on the same arc(s); either both are the same BMP,
# or if one is not a BMP, the other is also not a BMP or is
# the BMP at end of the arc (and it only has 1 incoming arc).
- if {$a eq $b} {
+ # Or both can be BMPs with no incoming arcs.
+ if {$a eq $b || $arcnos($a) eq {}} {
return 0
}
# assert {[llength $arcnos($a)] == 1}