Skip to content

Commit

Permalink
gitk: Fix bug in fix for warning when removing a branch
Browse files Browse the repository at this point in the history
My fix in commit b1054ac was only
half-right, since it ignored the case where the descendent heads of
the head being removed correspond to two or more different commits.
This fixes it.  Reported by Mark Levedahl.

Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Paul Mackerras committed Aug 17, 2007
1 parent e8b5f4b commit d7b1611
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion gitk
Original file line number Diff line number Diff line change
Expand Up @@ -6208,7 +6208,7 @@ proc rmbranch {} {
return
}
set dheads [descheads $id]
if {$idheads($dheads) eq $head} {
if {[llength $dheads] == 1 && $idheads($dheads) eq $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 d7b1611

Please sign in to comment.