gitk: Fix bug in fix for warning when removing a branch
My fix in commit b1054ac985aebc90c0a78202dab8477b74d7818a 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>
Paul Mackerras committed
Aug 17, 2007 at 17:57 UTC
d7b16113a128ff04134cec4a8e241cf9cd0a49a2
1 file changed
+1
-1
gitk
+1
-1
@@ -6208,7 +6208,7 @@ proc rmbranch {} {
6208
return
6209
}
6210
set dheads [descheads $id]
6211
- if {$idheads($dheads) eq $head} {
6211
+ if {[llength $dheads] == 1 && $idheads($dheads) eq $head} {
6212
# the stuff on this branch isn't on any other branch
6213
if {![confirm_popup "The commits on branch $head aren't on any other\
6214
branch.\nReally delete branch $head?"]} return