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 <paulus@samba.org>
Paul Mackerras committed
Aug 15, 2007 at 10:09 UTC
b1054ac985aebc90c0a78202dab8477b74d7818a
1 file changed
+2
-2
gitk
+2
-2
@@ -6168,7 +6168,7 @@ proc cobranch {} {
6168
6169
proc rmbranch {} {
6170
global headmenuid headmenuhead mainhead
6171
- global headids idheads
6171
+ global idheads
6172
6173
set head $headmenuhead
6174
set id $headmenuid
@@ -6178,7 +6178,7 @@ proc rmbranch {} {
6178
return
6179
}
6180
set dheads [descheads $id]
6181
- if {$dheads eq $headids($head)} {
6181
+ if {$idheads($dheads) eq $head} {
6182
# the stuff on this branch isn't on any other branch
6183
if {![confirm_popup "The commits on branch $head aren't on any other\
6184
branch.\nReally delete branch $head?"]} return