chiark / gitweb /
dgit: split brain reorg: Check $split_brain against $do_split_brain
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 6 Jun 2019 15:23:43 +0000 (16:23 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 28 Jun 2019 11:45:38 +0000 (12:45 +0100)
commitb4195a2465d892f7bf79fba55f169255a2768ada
tree85ec01b2464f8cd0dceb9aaedb700cc3da9564c8
parent20d1d3d7ab35acd079f0ccf4127dcd74cb0265ac
dgit: split brain reorg: Check $split_brain against $do_split_brain

I think by now, $do_split_brain is always set early enough that
$split_brain here implies $do_split_brain.  And if $split_brain were
not set but $do_split_brain was, that would mean we hadn't actually
done the necessary work (constructing the and switching to the
dgit-view branch in the playtree or computing $dgithead).

Double check this with a couple of calls to confess.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit