From d7b16113a128ff04134cec4a8e241cf9cd0a49a2 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Fri, 17 Aug 2007 17:57:31 +1000 Subject: 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 --- gitk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gitk') diff --git a/gitk b/gitk index aa8baf857..0b5cfee0a 100755 --- a/gitk +++ b/gitk @@ -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 -- cgit v1.2.1