From: Paul Mackerras <paulus@samba.org>
Date: Wed, 4 Jul 2007 11:57:04 +0000 (+1000)
Subject: gitk: Fix bug in the anc_or_desc routine
X-Git-Tag: v1.5.3-rc1~1^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=69c0b5d2408cfe207f2976fc99cbe71208ba83ad;p=git-core%2Fgit.git

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>
---

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}