undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitk: Fix warning when removing a branch

Browse Source 
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>
This commit is contained in:
Paul Mackerras 2007-08-15 10:09:47 +10:00
parent a69b2d1a8b
commit b1054ac985
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gitk
View File

@ -6168,7 +6168,7 @@ proc cobranch {} {
proc rmbranch {} { proc rmbranch {} {
global headmenuid headmenuhead mainhead global headmenuid headmenuhead mainhead
global headids idheads global idheads
set head $headmenuhead set head $headmenuhead
set id $headmenuid set id $headmenuid
@ -6178,7 +6178,7 @@ proc rmbranch {} {
return return
} }
set dheads [descheads $id] 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 # the stuff on this branch isn't on any other branch
if {![confirm_popup "The commits on branch $head aren't on any other\ if {![confirm_popup "The commits on branch $head aren't on any other\
branch.\nReally delete branch $head?"]} return branch.\nReally delete branch $head?"]} return