Skip to content

Commit

Permalink
gitk: Fix a couple of buglets in the branch head menu items
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mackerras committed Aug 2, 2006
1 parent 1029915 commit 53cda8d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions gitk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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
Expand Down

0 comments on commit 53cda8d

Please sign in to comment.