Skip to content

Commit

Permalink
gitk: Fix warning when removing a branch
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mackerras committed Aug 15, 2007
1 parent a69b2d1 commit b1054ac
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions gitk
Original file line number Diff line number Diff line change
Expand Up @@ -6168,7 +6168,7 @@ proc cobranch {} {

proc rmbranch {} {
global headmenuid headmenuhead mainhead
global headids idheads
global idheads

set head $headmenuhead
set id $headmenuid
Expand All @@ -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
Expand Down

0 comments on commit b1054ac

Please sign in to comment.