@matheusbsbs / matheus-bagliano / commits / 53cda8d97e
Fork 0

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>

Paul Mackerras committed Aug 2, 2006 at 19:43 UTC 53cda8d97e6ee53cc8defa8c7226f0b3093eb12a
1 file changed +2 -2
gitk
+2 -2
@@ -5124,7 +5124,7 @@ proc cobranch {} {
5124 error_popup $err
5125 } else {
5126 notbusy checkout
5127 - set maainhead $headmenuhead
5127 + set mainhead $headmenuhead
5128 if {[info exists headids($oldmainhead)]} {
5129 redrawtags $headids($oldmainhead)
5130 }
@@ -5142,7 +5142,7 @@ proc rmbranch {} {
5142 error_popup "Cannot delete the currently checked-out branch"
5143 return
5144 }
5145 - if {$desc_heads($id) eq $id} {
5145 + if {$desc_heads($id) eq $id && $idheads($id) eq [list $head]} {
5146 # the stuff on this branch isn't on any other branch
5147 if {![confirm_popup "The commits on branch $head aren't on any other\
5148 branch.\nReally delete branch $head?"]} return