chiark / gitweb /
dgit: split brain reorg: Move some split brain code further out.
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 6 Jun 2019 12:54:48 +0000 (13:54 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 28 Jun 2019 11:45:38 +0000 (12:45 +0100)
commit0a65d9b91e6bb11ad6d842b3d5961320c154213b
tree7fdac93ef6c0a04e4aa8fabbd4d270c6ffff2386
parent43fdff73d08efd6dfc74b3e830492048bf7b76dc
dgit: split brain reorg: Move some split brain code further out.

We are going to want this in other quilt modes.  Logically, it should
occur in build_maybe_quilt_fixup.  Specifically, move:
 * the quilt cache check
 * the splitting of the dgit-view branch and setting $split_brain
out of quilt_fixup_multipatch.  quilt_fixup_multipatch now gets
$upstreamversion as a parameter.

Right now this logic in build_maybe_quilt_fixup is a bit flabby and
confusing.  We hope to tidy it up a bit later.

No functional change.

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