diff options
author | Paul Mackerras <paulus@samba.org> | 2007-08-17 17:57:31 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-08-17 17:57:31 +1000 |
commit | d7b16113a128ff04134cec4a8e241cf9cd0a49a2 (patch) | |
tree | ceb35340dd460691cf55c0523766fa82741910d3 /gitk | |
parent | e8b5f4be708a73fd8b6c06a782168d5b04e3e5c1 (diff) | |
download | git-d7b16113a128ff04134cec4a8e241cf9cd0a49a2.tar.gz |
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>
Diffstat (limited to 'gitk')
-rwxr-xr-x | gitk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |