mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-25 19:04:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

gitk: Fix bug in fix for warning when removing a branch

Browse Source 
My fix in commit b1054ac985 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>
This commit is contained in:
Paul Mackerras 2007-08-17 17:57:31 +10:00
parent e8b5f4be70
commit d7b16113a1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gitk
View File

@ -6208,7 +6208,7 @@ proc rmbranch {} {
return return
} }
set dheads [descheads $id] 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 # the stuff on this branch isn't on any other branch
if {![confirm_popup "The commits on branch $head aren't on any other\ if {![confirm_popup "The commits on branch $head aren't on any other\
branch.\nReally delete branch $head?"]} return branch.\nReally delete branch $head?"]} return