gitk: Fix bug in fix for warning when removing a branch

My fix in commit b1054ac985aebc90c0a78202dab8477b74d7818a was only
half-right, since it ignored the case where the descendent heads of
the head being removed correspond to two or more different commits.
This fixes it.  Reported by Mark Levedahl.

Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/gitk b/gitk
index aa8baf857e8938bc83fad6b25e5a3ae1ca64c7ed..0b5cfee0a722c40f17c07b115e33c80bd9d09a1e 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -6208,7 +6208,7 @@ proc rmbranch {} {
        return
     }
     set dheads [descheads $id]
-    if {$idheads($dheads) eq $head} {
+    if {[llength $dheads] == 1 && $idheads($dheads) eq $head} {
        # the stuff on this branch isn't on any other branch
        if {![confirm_popup "The commits on branch $head aren't on any other\
                        branch.\nReally delete branch $head?"]} return