summaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-08-15 00:09:47 (GMT)
committerPaul Mackerras <paulus@samba.org>2007-08-15 00:09:47 (GMT)
commitb1054ac985aebc90c0a78202dab8477b74d7818a (patch)
tree2168f77850a434535b1d0533aa333ffa11a64892 /gitk
parenta69b2d1a8bf335ddbf0929c609b2daa523c7ede0 (diff)
downloadgit-b1054ac985aebc90c0a78202dab8477b74d7818a.zip
git-b1054ac985aebc90c0a78202dab8477b74d7818a.tar.gz
git-b1054ac985aebc90c0a78202dab8477b74d7818a.tar.bz2
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>
Diffstat (limited to 'gitk')
-rwxr-xr-xgitk4
1 files changed, 2 insertions, 2 deletions
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