From: Paul Mackerras <paulus@samba.org>
Date: Wed, 2 Aug 2006 09:43:34 +0000 (+1000)
Subject: gitk: Fix a couple of buglets in the branch head menu items
X-Git-Tag: v1.4.3-rc1~135^2~9^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=53cda8d97e6ee53cc8defa8c7226f0b3093eb12a;p=git.git

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 fc65cc0f2..596f60586 100755
--- a/gitk
+++ b/gitk
@@ -5124,7 +5124,7 @@ proc cobranch {} {
 	error_popup $err
     } else {
 	notbusy checkout
-	set maainhead $headmenuhead
+	set mainhead $headmenuhead
 	if {[info exists headids($oldmainhead)]} {
 	    redrawtags $headids($oldmainhead)
 	}
@@ -5142,7 +5142,7 @@ proc rmbranch {} {
 	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