gitk: Fix a couple of buglets in the branch head menu items

This fixes a silly typo (an extra a) and fixes the condition for
asking for confirmation of removing a branch.

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

diff --git a/gitk b/gitk
index fc65cc0f24fe2022ebb25066ff9a577fb4c5881f..596f605868811df9454f3f889294bd76c8792ffd 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -5124,7 +5124,7 @@ proc cobranch {} {
        error_popup $err
     } else {
        notbusy checkout
        error_popup $err
     } else {
        notbusy checkout

-       set maainhead $headmenuhead
+       set mainhead $headmenuhead

        if {[info exists headids($oldmainhead)]} {
            redrawtags $headids($oldmainhead)
        }
        if {[info exists headids($oldmainhead)]} {
            redrawtags $headids($oldmainhead)
        }


@@ -5142,7 +5142,7 @@ proc rmbranch {} {
        error_popup "Cannot delete the currently checked-out branch"
        return
     }
        error_popup "Cannot delete the currently checked-out branch"
        return
     }

-    if {$desc_heads($id) eq $id} {
+    if {$desc_heads($id) eq $id && $idheads($id) eq [list $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
        # 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