From b1054ac985aebc90c0a78202dab8477b74d7818a Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Wed, 15 Aug 2007 10:09:47 +1000 Subject: gitk: Fix warning when removing a branch When we had two heads on the same commit, and the user tried to remove one of them, gitk was sometimes incorrectly saying that the commits on that branch weren't on any other branch. This fixes it. Signed-off-by: Paul Mackerras diff --git a/gitk b/gitk index 57617d5..6faa7f7 100755 --- a/gitk +++ b/gitk @@ -6168,7 +6168,7 @@ proc cobranch {} { proc rmbranch {} { global headmenuid headmenuhead mainhead - global headids idheads + global idheads set head $headmenuhead set id $headmenuid @@ -6178,7 +6178,7 @@ proc rmbranch {} { return } set dheads [descheads $id] - if {$dheads eq $headids($head)} { + if {$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 v0.10.2-6-g49f6