mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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>
This commit is contained in:
parent
10299152ca
commit
53cda8d97e
4
gitk
4
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
|
||||
|
|
Loading…
Reference in a new issue